diff --git a/application/views/debug/main.php b/application/views/debug/main.php
index 334c93df..7d8aacc4 100644
--- a/application/views/debug/main.php
+++ b/application/views/debug/main.php
@@ -159,23 +159,26 @@
             </div>
         </div>
         <?php if (file_exists('.git')) { ?>
-        <div class="card">
         <?php
             $commitHash = trim(exec('git log --pretty="%H" -n1 HEAD'));
-            $commitDate = trim(exec('git log --pretty="%ci" -n1 HEAD'));
-            $line = trim(exec('git log -n 1 --pretty=%D HEAD'));
-            $pieces = explode(', ', $line);
-            $remote = substr($pieces[1], 0, strpos($pieces[1], '/'));
-            $branch = substr($pieces[1], strpos($pieces[1], '/')+1);
-            $url = trim(exec('git remote get-url '.$remote));
-            $owner = '';
-            if (strpos($url, 'https://github.com') !== false) {
-               $owner = preg_replace('/https:\/\/github\.com\/(\w+)\/Cloudlog\.git/', '$1', $url);
-            } else if (strpos($url, 'git@github.com') !== false) {
-               $owner = preg_replace('/git@github\.com:(\w+)\/Cloudlog\.git/', '$1', $url);
+            // only proceed here if git can actually be executed
+            if ($commitHash != "") {
+               $commitDate = trim(exec('git log --pretty="%ci" -n1 HEAD'));
+               $line = trim(exec('git log -n 1 --pretty=%D HEAD'));
+               $pieces = explode(', ', $line);
+               $remote = substr($pieces[1], 0, strpos($pieces[1], '/'));
+               $branch = substr($pieces[1], strpos($pieces[1], '/')+1);
+               $url = trim(exec('git remote get-url '.$remote));
+               $owner = '';
+               if (strpos($url, 'https://github.com') !== false) {
+                  $owner = preg_replace('/https:\/\/github\.com\/(\w+)\/Cloudlog\.git/', '$1', $url);
+               } else if (strpos($url, 'git@github.com') !== false) {
+                  $owner = preg_replace('/git@github\.com:(\w+)\/Cloudlog\.git/', '$1', $url);
+               }
+               $tag = trim(exec('git describe --tags '.$commitHash));
             }
-            $tag = trim(exec('git describe --tags '.$commitHash));
         ?>
+        <div class="card">
             <div class="card-header">Git Information</div>
             <div class="card-body">
                 <table width="100%">