Index: trunk/sites/all/modules/casetracker/casetracker.module
===================================================================
@@ -694,37 +694,27 @@
 /**
  * Returns an query string needed in case of Organic Groups
  * providing preselected audience checkboxes for projects as groups (og)
- *
+ *
  * @param   object  CT project
  * @return  string
  */
 function _casetracker_get_og_query_string(&$project) {
   $querystring = array();
-  // checking if project is group
-  if ($project->type == 'group') {
-    $querystring[] = 'gids[]='. $project->nid;
-    //checking if group-project is part of another group
-    if (isset($project->og_groups)
-      && is_array($project->og_groups)
-    ) {
+
+  if (module_exists('og')) {
+    // checking if project is group
+    if (in_array($project->type, og_get_types('group'))) {
+  	  $querystring[] = 'gids[]='. $project->nid;
+    }
+    //checking if project is part of a group
+    elseif (isset($project->og_groups) && is_array($project->og_groups)) {
       foreach ($project->og_groups as $group) {
         $querystring[] = 'gids[]='. $group;
       }
     }
   }
-  //checking if project is part of a group
-  elseif (isset($project->og_groups)
-    && is_array($project->og_groups)
-    && $project->type !== 'group'
-  ) {
-    foreach ($project->og_groups as $group) {
-      $querystring[] = 'gids[]='. $group;
-    }
-  }
-
-  return (0 < count($querystring))
-      ? implode('&', $querystring)
-      : NULL;
+
+  return (!empty($querystring)) ? implode('&', $querystring) : NULL;
 }
