diff --git a/functions.php b/functions.php
index b053908..952f814 100644
--- a/functions.php
+++ b/functions.php
@@ -161,21 +161,25 @@ function show_service($name, $containers) {
 function show_service_update($name, $update, $uptodate) {
 	$str = '<div>'.$name."</div>";
 
-	$str .= '<div id="'.$name.'" style="padding-left: 20px">';
 	$update = trim($update);
-	$arr = explode(" ",$update);
-	foreach ($arr as $container) {
-		$str .= $container." - UPDATE AVAILABLE<br>";
+	if (!empty($update)) {
+		$str .= '<div id="'.$name.'" style="padding-left: 20px">';
+		$arr = explode(" ",$update);
+		foreach ($arr as $container) {
+			$str .= $container." - UPDATE AVAILABLE<br>";
+		}
+		$str .= '</div>';
 	}
-	$str .= '</div>';
 
-	$str .= '<div id="'.$name.'" style="padding-left: 20px">';
 	$uptodate = trim($uptodate);
-	$arr = explode(" ",$uptodate);
-	foreach ($arr as $container) {
-		$str .= $container." - Already up to date<br>";
+	if (!empty($uptodate)) {
+		$str .= '<div id="'.$name.'" style="padding-left: 20px">';
+		$arr = explode(" ",$uptodate);
+		foreach ($arr as $container) {
+			$str .= $container." - Already up to date<br>";
+		}
+		$str .= '</div>';
 	}
-	$str .= '</div>';
 
 	echo $str;
 }
diff --git a/scan.php b/scan.php
index 3bbf77d..de8235e 100644
--- a/scan.php
+++ b/scan.php
@@ -101,7 +101,7 @@ switch ($_GET["op"]) {
 				if ($key=="updates") {
 					if ($data["INSTALL_STATUS"]==1) {
 						foreach ($data["INSTALLED_SERVICES"] as $service_name => $object) {
-							show_service_update($service_name, $object["update"], $object["uptodate"]);
+							show_service_update($service_name, trim($object["update"]), trim($object["uptodate"]));
 						}
 						echo "<br>";
 					}