diff --git a/self-diagnostics/Makefile b/self-diagnostics/Makefile
index 0c44c8d67..6f9b85bd4 100644
--- a/self-diagnostics/Makefile
+++ b/self-diagnostics/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=self-diagnostics
-PKG_VERSION:=1.0.11
+PKG_VERSION:=1.0.12
 PKG_RELEASE:=1
 
 PKG_LICENSE:=GPL-2.0-only
diff --git a/self-diagnostics/files/usr/sbin/self-diagnostics b/self-diagnostics/files/usr/sbin/self-diagnostics
index c6748b0f0..3701dfec1 100755
--- a/self-diagnostics/files/usr/sbin/self-diagnostics
+++ b/self-diagnostics/files/usr/sbin/self-diagnostics
@@ -84,11 +84,11 @@ config_load()
 	fi
 
 	temp="$(db -q get device.deviceinfo.ModelName)"
-	[ -d "${temp}" ] && \
+	[ -n "${temp}" ] && \
 		MODEL="${temp}"
 
 	temp="$(db -q get device.deviceinfo.SerialNumber)"
-	[ -d "${temp}" ] && \
+	[ -n "${temp}" ] && \
 		SERIAL="${temp}"
 
 	temp="$(uci -q get self-diagnostics.globals.extended_spec_dir)"