diff --git a/src/Controller/SystemStatusController.php b/src/Controller/SystemStatusController.php
index 36b5a74..ebd2040 100644
--- a/src/Controller/SystemStatusController.php
+++ b/src/Controller/SystemStatusController.php
@@ -88,7 +88,7 @@ class SystemStatusController extends ControllerBase {
           $res['core']['drupal'] = ["version" => $module_info['version']];
 
       // Skip Core and Field types
-      if($module_info['package'] == "Core" || $module_info['package'] == "Field types" || $module_info['project'] == 'drupal')
+      if($module_info['package'] == "Core" || $module_info['package'] == "Field types" || (isset($module_info['project']) && $module_info['project'] == 'drupal'))
          continue;
 
       // TODO:
@@ -108,7 +108,7 @@ class SystemStatusController extends ControllerBase {
       $filename = $theme->getPath() . '/' . $theme->getFilename();
       $theme_info = Yaml::decode(file_get_contents($filename));
 
-      if($theme_info['project'] == 'drupal')
+      if(isset($theme_info['project']) && $theme_info['project'] == 'drupal')
         continue;
 
       if(isset($theme_info['project'])) {