diff -r 49a5318256f0 -r f4d75ef899f4 brewco/prompt.c
--- a/brewco/prompt.c	Sun Dec 20 23:26:03 2015 +0100
+++ b/brewco/prompt.c	Mon Dec 21 21:09:36 2015 +0100
@@ -48,7 +48,10 @@
 			piUnlock(LOCK_LCD);
 #endif
 			return;
-	case 100:	snprintf(message, Config.lcd_cols + 1, text);
+	case 100:	if (text == NULL)
+			    snprintf(message, Config.lcd_cols + 1, "                    ");
+			else
+			    snprintf(message, Config.lcd_cols + 1, text);
 			break;
 	case 101:	snprintf(message, Config.lcd_cols + 1, "    Brewco %s   \007", VERSION);
 			break;
@@ -114,7 +117,10 @@
 			break;
 	case 196:	snprintf(message, Config.lcd_cols + 1, "   Edit Hopstand    ");
 			break;
-	case 200:	snprintf(message, Config.lcd_cols + 1, text);
+	case 200:	if (text == NULL)
+			    snprintf(message, Config.lcd_cols + 1, "                    ");
+			else
+			    snprintf(message, Config.lcd_cols + 1, text);
 			break;
 	case 202:	snprintf(message, Config.lcd_cols + 1, "   Manage Recipes   ");
 			break;
@@ -150,23 +156,30 @@
 			break;
 	case 218:	snprintf(message, Config.lcd_cols + 1, "  Add Brewsystem?   ");
 			break;
-	case 219:	snprintf(message, Config.lcd_cols + 1, "     Manual HLT     ");
-			break;
-	case 220:	snprintf(message, Config.lcd_cols + 1, "     Manual MLT     ");
-			break;
+
 	case 221:       snprintf(message, Config.lcd_cols + 1, "   Select Recipe    ");
 			break;
 	case 222:       snprintf(message, Config.lcd_cols + 1, " Select Brewsystem  ");
 			break;
 	case 223:       snprintf(message, Config.lcd_cols + 1, "   Select Device    ");
 			break;
-	case 300:	snprintf(message, Config.lcd_cols + 1, text);
+	case 300:	if (text == NULL)
+			    snprintf(message, Config.lcd_cols + 1, "                    ");
+			else
+			    snprintf(message, Config.lcd_cols + 1, text);
 			break;
 	case 301:	snprintf(message, Config.lcd_cols + 1, "      Finished      ");
 			break;
 	case 302:	snprintf(message, Config.lcd_cols + 1, "   Shutting down    ");
 			break;
-	case 400:	snprintf(message, Config.lcd_cols + 1, text);
+	case 303:       snprintf(message, Config.lcd_cols + 1, "     Manual HLT     ");
+			break;
+	case 304:       snprintf(message, Config.lcd_cols + 1, "     Manual MLT     ");
+			break;
+	case 400:	if (text == NULL)
+			    snprintf(message, Config.lcd_cols + 1, "                    ");
+			else
+			    snprintf(message, Config.lcd_cols + 1, text);
 			break;
 	case 401:       snprintf(message, Config.lcd_cols + 1, "---  MAN  AUTO SETUP");
 			break;