diff --git a/WHATS_NEW b/WHATS_NEW
index b944a393e..740c5dc82 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.92 - 
 ====================================
+  Properly test buffer for unit check in units_to_bytes().
   Add configure --with-systemdsystemunitdir.
   Add check for allocation failure in _build_matcher().
   Add check for rimage name allocation failure in _raid_add_images().
diff --git a/lib/display/display.c b/lib/display/display.c
index d734c39a2..8ceb44955 100644
--- a/lib/display/display.c
+++ b/lib/display/display.c
@@ -60,7 +60,7 @@ uint64_t units_to_bytes(const char *units, char *unit_type)
 		v = 1;
 
 	/* Only one units char permitted. */
-	if (*(units + 1))
+	if (units[0] && units[1])
 		return 0;
 
 	if (v == 1)