diff --git a/src/bot.c b/src/bot.c
index 3d438a4..1b4fa80 100644
--- a/src/bot.c
+++ b/src/bot.c
@@ -720,7 +720,7 @@ void onReplayDownloadResponse(struct triceBot *b,
                               const Response *resp,
                               void *param) {
     // If resp is NULL the request timed out.
-    if (resp == NULL) {
+    if (resp == NULL || !resp->HasExtension(Response_ReplayDownload::ext)) {
         int replayID = *(int *) param;
         printf("[ERROR]: Replay %d failed to download.\n",
                replayID);
diff --git a/src/game_struct.c b/src/game_struct.c
index 3367074..44f483b 100644
--- a/src/game_struct.c
+++ b/src/game_struct.c
@@ -110,7 +110,7 @@ void freeGameCreateCallbackWaitParam(struct gameCreateCallbackWaitParam *gp) {
     }
 }
 
-//Not thread safe version
+// Not thread safe version
 static void freeGameListNodeNTS(struct gameListNode *gl) {
     if (gl != NULL) {
         if (gl->currentGame != NULL) {