diff --git a/hooks/edgy/80-install-kernel b/hooks/edgy/80-install-kernel
index 95ae1f0..5e85126 100755
--- a/hooks/edgy/80-install-kernel
+++ b/hooks/edgy/80-install-kernel
@@ -27,7 +27,7 @@ fi
 
 logMessage Script $0 starting
 
-if [ ${pygrub} ]; then
+if [ "${pygrub}" ]; then
 
 #
 # Attempt to install a xen kernel, if that fails, then install a normal one
@@ -103,7 +103,7 @@ installDebianPackage ${prefix} module-init-tools
 
 else
     logMessage pygrub not set, skipping kernel install
-fi
+fi # if pygrub
 
 #
 #  Log our finish
diff --git a/hooks/intrepid/80-install-kernel b/hooks/intrepid/80-install-kernel
index 4ca7ade..e979715 100755
--- a/hooks/intrepid/80-install-kernel
+++ b/hooks/intrepid/80-install-kernel
@@ -27,7 +27,7 @@ fi
 
 logMessage Script $0 starting
 
-if [ ${pygrub} ]; then
+if [ "${pygrub}" ]; then
 
 #
 # Attempt to install a xen kernel, if that fails, then install a normal one
@@ -93,7 +93,7 @@ installDebianPackage ${prefix} module-init-tools
 
 else
     logMessage pygrub not set, skipping kernel install
-fi
+fi # if pygrub
 
 #
 #  Log our finish
diff --git a/hooks/karmic/80-install-kernel b/hooks/karmic/80-install-kernel
index 9c94263..b136b4a 100755
--- a/hooks/karmic/80-install-kernel
+++ b/hooks/karmic/80-install-kernel
@@ -20,14 +20,14 @@ if [ -e /usr/lib/xen-tools/common.sh ]; then
 else
     . ./hooks/common.sh
 fi
-
-if [ "${pygrub}" ]; then
 #
 # Log our start
 #
 
 logMessage Script $0 starting
 
+if [ "${pygrub}" ]; then
+
 #
 # The type of kernel that we will be installing
 #