diff --git a/platforms/nuttx/NuttX/apps b/platforms/nuttx/NuttX/apps
index a489381b49..616f7024a4 160000
--- a/platforms/nuttx/NuttX/apps
+++ b/platforms/nuttx/NuttX/apps
@@ -1 +1 @@
-Subproject commit a489381b49835ecba6f3b873b5071d882a18152f
+Subproject commit 616f7024a479bf209eadce133bba5dc8820a7f99
diff --git a/src/modules/mavlink/mavlink_shell.cpp b/src/modules/mavlink/mavlink_shell.cpp
index deb5286dfd..723c535781 100644
--- a/src/modules/mavlink/mavlink_shell.cpp
+++ b/src/modules/mavlink/mavlink_shell.cpp
@@ -186,7 +186,13 @@ int MavlinkShell::shell_start_thread(int argc, char *argv[])
 #ifdef __PX4_NUTTX
 	dup2(1, 2); //redirect stderror to stdout
 
-	nsh_consolemain(0, NULL);
+	const int ret = nsh_consolemain(0, NULL);
+
+	if (ret) {
+		PX4_ERR("Mavlink shell failed: %d%s", ret, (ret == -ENOMEM) ? " (out of memory)" : "");
+		return ret;
+	}
+
 #endif /* __PX4_NUTTX */
 
 #ifdef __PX4_POSIX