Index: NVDataMgmt.c
===================================================================
diff -u -r1f023a03f6085182f5b2b95583eb05c2e8078c58 -r6aa9ae731763939eaffc273e4b4c16f2ae34724c
--- NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 1f023a03f6085182f5b2b95583eb05c2e8078c58)
+++ NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 6aa9ae731763939eaffc273e4b4c16f2ae34724c)
@@ -2734,6 +2734,13 @@
 
         activateAlarmNoData( ALARM_ID_DG_INVALID_SYSTEM_RECORD_CRC );
     }
+    else
+    {
+        if ( RECORD_DEFAULT_CHARACTER == dgSystemGroup.dgSystemRecord.topLevelSN[ 0 ] )
+        {
+            activateAlarmNoData( ALARM_ID_DG_INVALID_SERIAL_NUMBER );
+        }
+    }
 
     return status;
 }
@@ -3415,6 +3422,14 @@
 
         activateAlarmNoData( ALARM_ID_HD_INVALID_SYSTEM_RECORD_CRC );
     }
+    else
+    {
+        // Check if the first character of the serial number is not empty space. If it is, trigger the alarm
+        if ( RECORD_DEFAULT_CHARACTER == hdSystemGroup.hdsystemRecord.topLevelSN[ 0 ] )
+        {
+            activateAlarmNoData( ALARM_ID_HD_INVALID_SERIAL_NUMBER );
+        }
+    }
 
     return status;
 }