diff --git sites/all/modules/contrib/workflow/workflow.module sites/all/modules/contrib/workflow/workflow.module
index 8a11f9d..de6ca3a 100644
--- sites/all/modules/contrib/workflow/workflow.module
+++ sites/all/modules/contrib/workflow/workflow.module
@@ -313,18 +313,34 @@
  * Implements hook_node_load(). Consider replacing with hook_entity_load().
  */
 function workflow_node_load($nodes, $types) {
-  foreach ($nodes as $node) {
+	// Since this function is loaded on all node_loads we should be selective about
+	// which node types we actually need to load the current state for  
+	// $types_to_check is an array of content types that have a valid WID and 
+	// therefore a valid workflow
+	$workflow_types = workflow_get_workflow_type_map();
+	$types_to_check = array();
+	foreach($workflow_types as $type) {
+		if ($type->wid !=0) {
+			$types_to_check[] = $type->type;
+		}
+	}
+	
+	foreach ($nodes as $node) {
     // ALERT: With the upgrade to Drupal 7, values stored on the node as _workflow_x
     // have been standardized to workflow_x, dropping the initial underscore.
     // Module maintainers integrating with workflow should keep that in mind.
-    $node->workflow = workflow_node_current_state($node);
-    // Add scheduling information.
-    // Technically you could have more than one scheduled, but this will only add the soonest one.
-    foreach (workflow_get_workflow_scheduled_transition_by_nid($node->nid) as $row) {
-      $node->workflow_scheduled_sid = $row->sid;
-      $node->workflow_scheduled_timestamp = $row->scheduled;
-      $node->workflow_scheduled_comment = $row->comment;
-      break;
+
+	// If the specified node is a valid type to check then proceed by getting workflow information
+    if (in_array($node->type, $types_to_check)) {
+	    $node->workflow = workflow_node_current_state($node);
+	    // Add scheduling information.
+	    // Technically you could have more than one scheduled, but this will only add the soonest one.
+	    foreach (workflow_get_workflow_scheduled_transition_by_nid($node->nid) as $row) {
+	      $node->workflow_scheduled_sid = $row->sid;
+	      $node->workflow_scheduled_timestamp = $row->scheduled;
+	      $node->workflow_scheduled_comment = $row->comment;
+	      break;
+	    }
     }
   }
 }