0
@@ -21,6 +21,7 @@ class midcom_core_exceptionhandler
0
         {
0
             case 'midcom_exception_notfound':
0
             case 'midcom_exception_unauthorized':
0
+            case 'midcom_exception_httperror':
0
                 $http_code = $exception->getCode();
0
                 break;
0
 
0
@@ -58,6 +59,7 @@ class midcom_core_exceptionhandler
0
             401 => 'HTTP/1.0 401 Unauthorized',
0
             404 => 'HTTP/1.0 404 Not Found',
0
             500 => 'HTTP/1.0 500 Server Error',
0
+            503 => 'HTTP/1.0 503 Service Unavailable',
0
         );
0
 
0
         if (!isset($headers[$code]))
0
@@ -97,5 +99,19 @@ class midcom_exception_unauthorized extends Exception
0
     }
0
 }
0
 
0
+/**
0
+ * MidCOM 3 generic HTTP error exception
0
+ *
0
+ * @package midcom_core
0
+ */
0
+class midcom_exception_httperror extends Exception
0
+{
0
+    // Redefine the exception so message isn't optional
0
+    public function __construct($message, $code = 500) 
0
+    {
0
+        parent::__construct($message, $code);
0
+    }
0
+}
0
+
0
 set_exception_handler(array('midcom_core_exceptionhandler', 'handle'));
0
 ?>
0
\ No newline at end of file

0
@@ -21,6 +21,11 @@ class midcom_core_services_dispatcher_midgard2 extends midcom_core_services_disp
0
         {
0
             throw new Exception('Midgard 2.x is required for this MidCOM setup.');
0
         }
0
+        
0
+        if (!is_object($_MIDGARD_CONNECTION->request_config))
0
+        {
0
+            throw new midcom_exception_httperror('Midgard database connection not found.', 503);
0
+        }
0
 
0
         foreach ($_MIDGARD_CONNECTION->request_config->argv as $argument)
0
         {