diff --git a/self-diagnostics/Makefile b/self-diagnostics/Makefile
index d5bf44c11..29fd66467 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.1
+PKG_VERSION:=1.0.2
 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 56f9159d3..0e7f6a6d3 100755
--- a/self-diagnostics/files/usr/sbin/self-diagnostics
+++ b/self-diagnostics/files/usr/sbin/self-diagnostics
@@ -188,9 +188,10 @@ exec_spec()
 					exec_timeout=$TIMEOUT
 				fi
 				log "Executing $cmd with timeout $exec_timeout"
-				echo "##################" >> $export_path
-				echo $description >> $export_path
-				echo "##################" >> $export_path
+				echo "##########################################" >> $export_path
+				echo "# $description #">> $export_path
+				echo "# Exec [$cmd], timeout [$exec_timeout] #" >> $export_path
+				echo "##########################################" >> $export_path
 				if [ "$VERBOSE" -eq 1 ]; then
 					if [[ "$cmd" == *"logread "* ]]; then
 						eval timeout ${exec_timeout} $cmd 2>&1 | tee -a $export_path
@@ -203,7 +204,8 @@ exec_spec()
 					eval timeout ${exec_timeout} $cmd >> $export_path 2>&1
 					rc=$?
 				fi
-				
+				echo "######## Execution return code $rc ######" >> $export_path
+
 				if [ "$rc" -eq 0 ]; then
 					log "Execution [$cmd] completed"
 				else
@@ -216,6 +218,9 @@ exec_spec()
 		done
 		json_select ..
 	fi
+
+	log "Handling of $json_file done"
+	log ""
 }
 
 generate_module()