diff --git a/boards/ssrc/saluki-nxp93 b/boards/ssrc/saluki-nxp93
index 9dfce7bc7ca9..ebfc963fed7e 160000
--- a/boards/ssrc/saluki-nxp93
+++ b/boards/ssrc/saluki-nxp93
@@ -1 +1 @@
-Subproject commit 9dfce7bc7ca9b21145a5c2b8fb45d4cc9fc2625a
+Subproject commit ebfc963fed7e96666a4dff3b1aa31671982d0bbf
diff --git a/platforms/nuttx/NuttX/nuttx b/platforms/nuttx/NuttX/nuttx
index adb69b42aaf4..81c54d331790 160000
--- a/platforms/nuttx/NuttX/nuttx
+++ b/platforms/nuttx/NuttX/nuttx
@@ -1 +1 @@
-Subproject commit adb69b42aaf457f9cc11d13249e0fcc88dfd8eae
+Subproject commit 81c54d331790c59365133404996fe1832b38e21d
diff --git a/platforms/nuttx/src/px4/common/usr_mcu_version.cpp b/platforms/nuttx/src/px4/common/usr_mcu_version.cpp
index 058967d1899c..b0631d6f0aa3 100644
--- a/platforms/nuttx/src/px4/common/usr_mcu_version.cpp
+++ b/platforms/nuttx/src/px4/common/usr_mcu_version.cpp
@@ -111,9 +111,17 @@ int board_mcu_version(char *rev, const char **revstr, const char **errata)
 	unsigned len = sizeof(hw_version_table) / sizeof(hw_version_table[0]);
 
 	if (hw_version < len) {
-		*rev = hw_version_table[hw_version].rev;
-		*revstr = hw_version_table[hw_version].revstr;
-		*errata = hw_version_table[hw_version].errata;
+		if (rev) {
+			*rev = hw_version_table[hw_version].rev;
+		}
+
+		if (revstr) {
+			*revstr = hw_version_table[hw_version].revstr;
+		}
+
+		if (errata) {
+			*errata = hw_version_table[hw_version].errata;
+		}
 	}
 
 	return hw_version;