diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index f17f96ca7..7f0779b64 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -1021,7 +1021,11 @@ int CmdHFiClassCloneTag(const char *Cmd) {
 	// else we have to create a share memory
 	int i;
 	fseek(f,startblock*8,SEEK_SET);
-	fread(tag_data,sizeof(iclass_block_t),endblock - startblock + 1,f);
+	if ( fread(tag_data,sizeof(iclass_block_t),endblock - startblock + 1,f) == 0){
+		PrintAndLog("File reading error.");
+		fclose(f);
+		return 2;
+	}
 
 	uint8_t MAC[4]={0x00,0x00,0x00,0x00};
 	uint8_t div_key[8]={0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index b967936b4..386ac608b 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -1317,7 +1317,7 @@ int CmdT55xxWipe(const char *Cmd) {
 		if (!CmdT55xxWriteBlock(ptrData)) 
 			PrintAndLog("Error writing blk %d", blk);
 		
-		memset(writeData, sizeof(writeData), 0x00);
+		memset(writeData,0x00, sizeof(writeData));
 	}
 	return 0;
 }