diff --git a/bin/basic_generic.rom b/bin/basic_generic.rom
index 90052287..24f25b28 100644
Binary files a/bin/basic_generic.rom and b/bin/basic_generic.rom differ
diff --git a/bin/basic_ultimate64.rom b/bin/basic_ultimate64.rom
index b84cd139..c9df070d 100644
Binary files a/bin/basic_ultimate64.rom and b/bin/basic_ultimate64.rom differ
diff --git a/bin/kernal_generic.rom b/bin/kernal_generic.rom
index 06a5a7fb..ed644e42 100644
Binary files a/bin/kernal_generic.rom and b/bin/kernal_generic.rom differ
diff --git a/bin/kernal_ultimate64.rom b/bin/kernal_ultimate64.rom
index 9f4108ff..4124be18 100644
Binary files a/bin/kernal_ultimate64.rom and b/bin/kernal_ultimate64.rom differ
diff --git a/bin/mega65.rom b/bin/mega65.rom
index 6c788321..d6379421 100644
Binary files a/bin/mega65.rom and b/bin/mega65.rom differ
diff --git a/bin/mega65_pxlfont.rom b/bin/mega65_pxlfont.rom
index 2b2c51e8..f56acc9f 100644
Binary files a/bin/mega65_pxlfont.rom and b/bin/mega65_pxlfont.rom differ
diff --git a/src/basic/editor/delete_line.s b/src/basic/editor/delete_line.s
index 792d1237..6b981003 100644
--- a/src/basic/editor/delete_line.s
+++ b/src/basic/editor/delete_line.s
@@ -62,6 +62,7 @@ delete_line:
 
 	// Line length is <0 or >255 bytes.
 	// Either way, things are bad, so abort.
+
 	jmp do_MEMORY_CORRUPT_error
 !:
 	// Length can now be safely assumed to be in the low
diff --git a/src/basic/editor/find_line.s b/src/basic/editor/find_line.s
index a98cc91c..0a7bcab1 100644
--- a/src/basic/editor/find_line.s
+++ b/src/basic/editor/find_line.s
@@ -17,6 +17,38 @@ find_line:
 	lda TXTTAB+1
 	sta OLDTXT+1
 
+	// Check if BASIC text actually contains any program
+
+	lda #$00
+
+#if CONFIG_MEMORY_MODEL_60K
+	ldx #<OLDTXT+0
+	jsr peek_under_roms
+	cmp #$00
+#elif CONFIG_MEMORY_MODEL_46K || CONFIG_MEMORY_MODEL_50K
+	jsr peek_under_roms_via_OLDTXT
+	cmp #$00
+#else // CONFIG_MEMORY_MODEL_38K
+	lda (OLDTXT),y
+#endif
+
+	bne find_line_loop
+
+	iny
+
+#if CONFIG_MEMORY_MODEL_60K
+	ldx #<OLDTXT+0
+	jsr peek_under_roms
+	cmp #$00
+#elif CONFIG_MEMORY_MODEL_46K || CONFIG_MEMORY_MODEL_50K
+	jsr peek_under_roms_via_OLDTXT
+	cmp #$00
+#else // CONFIG_MEMORY_MODEL_38K
+	lda (OLDTXT),y
+#endif
+
+	beq find_line_fail
+
 	// FALLTROUGH
 
 find_line_loop:
diff --git a/src/basic/editor/insert_line.s b/src/basic/editor/insert_line.s
index afe16dfe..04a1a92d 100644
--- a/src/basic/editor/insert_line.s
+++ b/src/basic/editor/insert_line.s
@@ -26,7 +26,7 @@ insert_line:
 	// .byte $f1,<OLDTXT,>OLDTXT
 	// .byte $f0,<OLDTXT,>OLDTXT
 	// .byte $0d,0
-	
+
 	lda OLDTXT+0
 	pha
 	lda OLDTXT+1