diff --git a/core/composer.json b/core/composer.json
index 75814e2..5454ad2 100644
--- a/core/composer.json
+++ b/core/composer.json
@@ -35,7 +35,8 @@
     "fabpot/goutte": "^2.0.3",
     "masterminds/html5": "~2.1",
     "symfony/psr-http-message-bridge": "v0.2",
-    "zendframework/zend-diactoros": "1.1.0"
+    "zendframework/zend-diactoros": "1.1.0",
+    "aki-tendo/php7exception": "dev-master"
   },
   "replace": {
     "drupal/action": "self.version",
diff --git a/core/composer.lock b/core/composer.lock
index 49c5581..f981bcf 100644
--- a/core/composer.lock
+++ b/core/composer.lock
@@ -4,9 +4,48 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "a842b991264d42a2f8c5cecbd82597b1",
+    "hash": "05f6ba08b6a2c888ec8d3fd963c6e26b",
     "packages": [
         {
+            "name": "aki-tendo/php7exception",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/TendoAki/php-7-exceptions-in-php-5.git",
+                "reference": "1acf2c2feda0431ec26d9f7e49a73290df183bf1"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/TendoAki/php-7-exceptions-in-php-5/zipball/1acf2c2feda0431ec26d9f7e49a73290df183bf1",
+                "reference": "1acf2c2feda0431ec26d9f7e49a73290df183bf1",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "php7exceptions.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "GNU GENERAL PUBLIC LICENSE 2.0"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Lloyd Morris",
+                    "email": "tendoAki@gmail.com",
+                    "homepage": "https://github.com/TendoAki/",
+                    "role": "developer"
+                }
+            ],
+            "description": "Configures PHP 5.x to throw PHP 7 exceptions when possible",
+            "homepage": "https://github.com/TendoAki/php-7-exceptions-in-php-5",
+            "time": "2015-07-21 19:24:16"
+        },
+        {
             "name": "behat/mink",
             "version": "v1.6.1",
             "source": {
@@ -3449,7 +3488,9 @@
     "packages-dev": [],
     "aliases": [],
     "minimum-stability": "dev",
-    "stability-flags": [],
+    "stability-flags": {
+        "aki-tendo/php7exception": 20
+    },
     "prefer-stable": true,
     "prefer-lowest": false,
     "platform": {
diff --git a/core/vendor/composer/autoload_files.php b/core/vendor/composer/autoload_files.php
index 853f9a0..69e9c51 100644
--- a/core/vendor/composer/autoload_files.php
+++ b/core/vendor/composer/autoload_files.php
@@ -7,5 +7,6 @@
 
 return array(
     $vendorDir . '/react/promise/src/functions_include.php',
+    $vendorDir . '/aki-tendo/php7exception/php7exceptions.php',
     $baseDir . '/lib/Drupal.php',
 );
diff --git a/core/vendor/composer/installed.json b/core/vendor/composer/installed.json
index d8f6af5..0cc9040 100644
--- a/core/vendor/composer/installed.json
+++ b/core/vendor/composer/installed.json
@@ -3561,5 +3561,46 @@
             "validation",
             "validator"
         ]
+    },
+    {
+        "name": "aki-tendo/php7exception",
+        "version": "dev-master",
+        "version_normalized": "9999999-dev",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/TendoAki/php-7-exceptions-in-php-5.git",
+            "reference": "1acf2c2feda0431ec26d9f7e49a73290df183bf1"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/TendoAki/php-7-exceptions-in-php-5/zipball/1acf2c2feda0431ec26d9f7e49a73290df183bf1",
+            "reference": "1acf2c2feda0431ec26d9f7e49a73290df183bf1",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.0"
+        },
+        "time": "2015-07-21 19:24:16",
+        "type": "library",
+        "installation-source": "source",
+        "autoload": {
+            "files": [
+                "php7exceptions.php"
+            ]
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "GNU GENERAL PUBLIC LICENSE 2.0"
+        ],
+        "authors": [
+            {
+                "name": "Michael Lloyd Morris",
+                "email": "tendoAki@gmail.com",
+                "homepage": "https://github.com/TendoAki/",
+                "role": "developer"
+            }
+        ],
+        "description": "Configures PHP 5.x to throw PHP 7 exceptions when possible",
+        "homepage": "https://github.com/TendoAki/php-7-exceptions-in-php-5"
     }
 ]