diff --git a/sites/all/modules/contentanalysis/contentanalysis.module b/sites/all/modules/contentanalysis/contentanalysis.module
index 1150f81..8985bc2 100644
--- a/sites/all/modules/contentanalysis/contentanalysis.module
+++ b/sites/all/modules/contentanalysis/contentanalysis.module
@@ -524,7 +524,7 @@
     $analysis = contentanalysis_do_analysis($context, $analyzers);
     
     foreach ($analyzers AS $aid => $analyzer) {
-      if ($analyzer['admin form submit callback']) {
+      if (!empty($analyzer['admin form submit callback'])) {
         call_user_func($analyzer['admin form submit callback'], $form, $form_state);   
       }
     } 
@@ -556,7 +556,7 @@
     if (substr($anid, 0, 1)=='#' || !is_array($analysisi)) { 
       continue; 
     }
-    if((isset($analysisi['#status']) && ($analysisi['#status'] != 'status')) || ($analysisi['#score'])) {
+    if ((isset($analysisi['#status']) && ($analysisi['#status'] != 'status')) || (!empty($analysisi['#score']))) {
 		  $statusi = array(
 	      'error' => 0,
 			  'warning' => 1,
@@ -566,7 +566,7 @@
 		    'status' => $analysisi['#status'],
 		    'statusi' => $statusi[$analysisi['#status']],
 		  );
-		  if($analysisi['#score']) {
+		  if(!empty($analysisi['#score'])) {
 		    $fields['score'] = $analysisi['#score'];
 		  }
 		  $keys = array(
@@ -1236,7 +1236,7 @@
 function theme_contentanalysis_analysis($analysis) { 
   $titles = array();
   $bodies = array();
-  if (count($analysis['#context']['messages']) > 0) {
+  if (isset($analysis['#context']['messages']) && count($analysis['#context']['messages']) > 0) {
     //$titles[] = '<h3 class="analyzer">'.t('Messages')."</h3>\n";;
     $bodies[] = theme_contentanalysis_messages($analysis['#context']['messages']);
   }