diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index d47507357..86524cd6c 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -286,10 +286,10 @@ int CmdHFiClassELoad(const char *Cmd) {
 
 	if (fsize < 0) 	{
 		prnlog("Error, when getting filesize");
+		fclose(f);
 		return 1;
 	}
 
-
 	uint8_t *dump = malloc(fsize);
 
 	size_t bytes_read = fread(dump, 1, fsize, f);
@@ -1509,6 +1509,12 @@ static int loadKeys(char *filename) {
 	long fsize = ftell(f);
 	fseek(f, 0, SEEK_SET);
 
+	if ( fsize < 0 ) {
+		PrintAndLog("Error, when getting filesize");
+		fclose(f);
+		return 1;
+	}
+
 	uint8_t *dump = malloc(fsize);
 
 	size_t bytes_read = fread(dump, 1, fsize, f);