Index: sentry_server.module
===================================================================
--- sentry_server.module	(revision 70633)
+++ sentry_server.module	(working copy)
@@ -258,17 +258,22 @@
 function sentry_server_load($node) {
   // Site information
   $sentry_site = db_fetch_object(db_query('SELECT hostname, core_status, plugins, update_period, last_updated, cron_key FROM {sentry_sites} WHERE nid = %d', $node->nid));
-  $site->hostname = $sentry_site->hostname;
-  $site->sentry_last_updated = $sentry_site->last_updated;
-  $site->sentry_update_period = $sentry_site->update_period;
-  $site->cron_key = $sentry_site->cron_key;
-
-  $enabled_plugins = unserialize($sentry_site->plugins);
-  foreach ($enabled_plugins as $plugin => $enabled) {
-    if (0 === $enabled) { // so we can use in_array and isset instead of comparisons later on
-      unset($enabled_plugins[$plugin]);
-    }
+  
+  if (!empty($sentry_site->hostname)) {
+	  $site = new stdClass();
+	  $site->hostname = $sentry_site->hostname;
+	  $site->sentry_last_updated = $sentry_site->last_updated;
+	  $site->sentry_update_period = $sentry_site->update_period;
+	  $site->cron_key = $sentry_site->cron_key;
+	
+	  $enabled_plugins = unserialize($sentry_site->plugins);
+	  foreach ($enabled_plugins as $plugin => $enabled) {
+	    if (0 === $enabled) { // so we can use in_array and isset instead of comparisons later on
+	      unset($enabled_plugins[$plugin]);
+	    }
+	  }
   }
+  
   // Enable certain core plugins by hand
   $enabled_plugins['core'] = 'core';
   $enabled_plugins['core_cron'] = 'core_cron';
@@ -597,10 +602,16 @@
   $result = db_query_range('SELECT code, delay FROM {sentry_http_history} WHERE nid = %d ORDER BY timestamp DESC', $node->nid, 0, $max); 
 
   $http = array();
+  $count = 0;
   while ($record = db_fetch_object($result)) {
     if (!isset($first)) {
       $first = $record;
     }
+    
+    if (empty($http[$record->code])) {
+      $http[$record->code] = 0;
+    }
+    
     $http[$record->code]++;
     $count++;
   }
@@ -609,6 +620,7 @@
 
   $report = array();
   $report['title'] = $plugin_info['title'];
+  $report['description'] = '';
   //$report['description'] = t('Checking url: !url.', array('!url' => l($node->hostname, $node->hostname)));
   if (empty($http)) {
     $report['value'] = t('No access history available yet.');
@@ -690,6 +702,7 @@
   if (!isset($node_cache[$node->nid])) {
     // First of all lets find out which modules implement the plugin.
     $return = array();
+    $args = array();
     foreach (module_implements('plugin_info') as $module) {
       $function = $module .'_plugin_info';
       $return[$module] = call_user_func_array($function, $args);
@@ -789,7 +802,10 @@
   $row .= '<span class="icon">' . $icon . '</span>';
 
   if (isset($item['description'])) {
-    $class = $item['class'] ? $item['class'] . ' description' : 'description';
+    $class = 'description';
+    if (!empty($item['class'])) {
+      $class = $item['class'] . ' description';
+    }
     $row .= '<span class="' . $class . '">' . $item['description'] . '</span>';
   }
 
Index: sentry_performance/sentry_performance.module
===================================================================
--- sentry_performance/sentry_performance.module	(revision 70633)
+++ sentry_performance/sentry_performance.module	(working copy)
@@ -60,7 +60,13 @@
     $row = array();
     $row[] = $module['title'];
     $row[] = theme('sentry_item_status', array('status' => $module['status'], 'description' => $module['error']));
-    $row[] = $module['description'];
+    
+    if (!empty($module['description'])) {
+      $row[] = $module['description'];
+    }
+    else {
+      $row[] = '';
+    }
     $rows[] = $row;
   }
   $output .= theme('table', $header, $rows);
@@ -112,9 +118,15 @@
 function sentry_performance_checklist_configs($node) {
   $remote_variables = sentry_variable_load_site($node->nid);
   $sentry_performance_variables = _sentry_performance_variables();
+  
+  
 
   $status = SENTRY_OK; // Assume okay, if any of the configs don't match we will throw an error.
   foreach ($sentry_performance_variables as $name => $variable) {
+    
+    $sentry_performance_variables[$name]['status'] = '';
+    $sentry_performance_variables[$name]['error'] = '';
+    
     if (!(isset($remote_variables[$name]) && _sentry_performance_variable_match($variable, $remote_variables[$name]))) {
       $sentry_performance_variables[$name]['status'] = SENTRY_ERROR;
       $sentry_performance_variables[$name]['error'] = t('Variable not set properly.');
Index: sentry_seo/sentry_seo.module
===================================================================
--- sentry_seo/sentry_seo.module	(revision 70633)
+++ sentry_seo/sentry_seo.module	(working copy)
@@ -115,6 +115,10 @@
 
   $status = SENTRY_OK; // Assume okay, if any of the configs don't match we will throw an error.
   foreach ($sentry_seo_variables as $name => $variable) {
+    
+    $sentry_seo_variables[$name]['status'] = '';
+    $sentry_seo_variables[$name]['error'] = '';
+    
     if (!(isset($remote_variables[$name]) && _sentry_seo_variable_match($variable, $remote_variables[$name]))) {
       $sentry_seo_variables[$name]['status'] = SENTRY_ERROR;
       $sentry_seo_variables[$name]['error'] = t('Variable not set properly.');
@@ -128,21 +132,32 @@
 }
 
 function _sentry_seo_variable_match($reference, $remote) {
-  return (($reference['value'] == SENTRY_SET && $remote['value'] != '') || $reference['value'] == $remote['value']);
+  if (!empty($reference['value']) && !empty($remote['value'])) {
+    if (($reference['value'] == SENTRY_SET && $remote['value'] != '') || $reference['value'] == $remote['value']) {
+      return TRUE;
+    }
+  }
+  return FALSE;
 }
 
 function sentry_seo_checklist_modules($node) {
   $sentry_seo_modules = _sentry_seo_modules();
   $remote_modules = array();
+  
   foreach ($node->projects as $project) {
-    if ($project['type'] == 'module' && $project['title']) {
-      $remote_modules[$project['project_id']] = $project['title'];
+    if (!empty($project['project_type']) && !empty($project['title']) && $project['project_type'] == 'module') {
+      $remote_modules[$project['name']] = $project['title'];
     }
   }
   
   $status = SENTRY_OK;
   foreach ($sentry_seo_modules as $name => $module) {
+    
+    $sentry_seo_modules[$name]['status'] = '';
+    $sentry_seo_modules[$name]['error'] = '';
+    
     if (!isset($remote_modules[$name])) {
+      
       // We show error by resetting the title.
       $sentry_seo_modules[$name]['status'] = SENTRY_ERROR;
       $sentry_seo_modules[$name]['error'] = t('Module is not enabled.');
Index: sentry_server_cron/sentry_server_cron.module
===================================================================
--- sentry_server_cron/sentry_server_cron.module	(revision 70633)
+++ sentry_server_cron/sentry_server_cron.module	(working copy)
@@ -91,6 +91,11 @@
     if (!isset($first)) {
       $first = $record;
     }
+    
+    if (empty($cron[$record->code])) {
+      $cron[$record->code] = 0;
+    }
+    
     $cron[$record->code]++;
     $history[] = $record->delay;
   }
Index: sentry_server_update/sentry_server_update.module
===================================================================
--- sentry_server_update/sentry_server_update.module	(revision 70633)
+++ sentry_server_update/sentry_server_update.module	(working copy)
@@ -320,7 +320,9 @@
  */
 function sentry_server_update_update_projects($data) {
   foreach ($data as $project_id => $project) {
-    db_query('UPDATE {sentry_projects} SET status = %d, title = "%s" WHERE project_id = %d', $project['status'], $project['title'], $project_id);
+    if (!empty($project['title'])) {
+      db_query('UPDATE {sentry_projects} SET status = %d, title = "%s" WHERE project_id = %d', $project['status'], $project['title'], $project_id);
+    }
   }
 }
 
@@ -839,6 +841,7 @@
     $rows[][] = array('colspan' => 4, 'data' => t('No information available. Update due with the next cron run.'));
   }
 
+  $output = '';
   $output .= theme('table', $header, $rows);
   return $output;
 }
Index: sentry_server_update/sentry_server_update_projectpage.inc
===================================================================
--- sentry_server_update/sentry_server_update_projectpage.inc	(revision 70633)
+++ sentry_server_update/sentry_server_update_projectpage.inc	(working copy)
@@ -1,6 +1,7 @@
 <?php
 
 function sentry_server_update_projectpage($node) {
+  $output = '';
   $output .= l(t('Download'), 'node/' . $node->nid . '/projects/download');
   $output .= theme('sentry_project_status', $node);
   return $output;