diff --git a/common/serial.c b/common/serial.c
index fc38e6c2b4f52993dcf5b5198f39defa77f8a32f..acb74af963b92c0ae3bd1d22253f8c3ab758397a 100644
--- a/common/serial.c
+++ b/common/serial.c
@@ -222,8 +222,14 @@ static struct serial_device *get_current(void)
 		dev = default_serial_console();
 
 		/* We must have a console device */
-		if (!dev)
-			panic("Cannot find console");
+		if (!dev) {
+#ifdef CONFIG_SPL_BUILD
+			puts("Cannot find console\n");
+			hang();
+#else
+			panic("Cannot find console\n");
+#endif
+		}
 	} else
 		dev = serial_current;
 	return dev;