diff --git a/src/user.c b/src/user.c
index 6f151eaa..0b6266d1 100644
--- a/src/user.c
+++ b/src/user.c
@@ -637,9 +637,10 @@ user_history_add(User *user, gint type, const gchar *team_name,
 		      string0) == 0)
 	    {
 		/** Same cup round. */
-		if(strcmp(g_array_index(user->history, UserHistory, i).string[2],
-			  string2) == 0 &&
-		   type == USER_HISTORY_REACH_CUP_ROUND)
+		if(type == USER_HISTORY_REACH_CUP_ROUND &&
+		   string2 != NULL &&
+		   strcmp(g_array_index(user->history, UserHistory, i).string[2],
+			  string2) == 0)
 		    return;
 
 		his = &g_array_index(user->history, UserHistory, i);
diff --git a/support_files/lg_commentary/lg_commentary_en.xml b/support_files/lg_commentary/lg_commentary_en.xml
index 0ad3809e..16b59bea 100644
--- a/support_files/lg_commentary/lg_commentary_en.xml
+++ b/support_files/lg_commentary/lg_commentary_en.xml
@@ -318,7 +318,7 @@
     <commentary>_P0_ steps up to take the penalty</commentary>
     <commentary>_P0_ has a chance to score with a penalty kick</commentary>
     <commentary>_P0_ can make some of _T_POSS__ worries [disappear|go away] with this penalty</commentary>
-	 <commentary>Can [_P0_|_T_POSS_] convert the spot kick</commentary>
+	 <commentary>Can [_P0_|_T_POSS__] convert the spot kick</commentary>
     <commentary>You have to bury the nerves, swallow and concentrate when your taking penalties</commentary>
     <commentary cond="_PEN_POSS__ > 1">_T_POSS__ looks like they are playing for penalties.</commentary>
     <commentary cond="_GD_ = 0">_T_POSS__ can sneak ahead if they convert this</commentary>