diff --git a/c64/kernal/iec/load_iec.s b/c64/kernal/iec/load_iec.s
index 07bd6c26..0e91c125 100644
--- a/c64/kernal/iec/load_iec.s
+++ b/c64/kernal/iec/load_iec.s
@@ -24,9 +24,15 @@ load_break_error:
 	jsr iec_close_load
 	jmp kernalerror_ROUTINE_TERMINATED 
 
+load_save_no_file_name:
+
 
 load_iec:
 
+	// Check file name
+	lda FNLEN
+	beq_far kernalerror_FILE_NAME_MISSING
+
 	// Display SEARCHING FOR + filename
 	jsr lvs_display_searching_for
 
diff --git a/c64/kernal/iec/save_iec.s b/c64/kernal/iec/save_iec.s
index bb0afa8a..e580a167 100644
--- a/c64/kernal/iec/save_iec.s
+++ b/c64/kernal/iec/save_iec.s
@@ -21,7 +21,9 @@ save_iec_error:
 
 save_iec:
 
-	// XXX report error on empty file name
+	// Check file name
+	lda FNLEN
+	beq_far kernalerror_FILE_NAME_MISSING
 
 	// Display SAVING
 	jsr lvs_display_saving