diff --git a/pyiec61850/iec61850.i b/pyiec61850/iec61850.i
index 3e18daf7..8ad09df9 100644
--- a/pyiec61850/iec61850.i
+++ b/pyiec61850/iec61850.i
@@ -24,9 +24,13 @@ static bool IedConnection_downloadHandler(void* parameter, uint8_t* buffer, uint
 {
     FILE* fp = (FILE*) parameter;
 
+    if(fp == NULL){
+        return false;
+    }
     if (bytesRead > 0) {
         if (fwrite(buffer, bytesRead, 1, fp) != 1) {
             printf("Failed to write local file!\n");
+            fclose(fp);
             return false;
         }
     }