diff --git a/composer.json b/composer.json
index 4e2aa29df35d..b9d8137557dd 100644
--- a/composer.json
+++ b/composer.json
@@ -25,6 +25,7 @@
         "monolog/monolog": "~1.12",
         "mtdowling/cron-expression": "~1.0",
         "nesbot/carbon": "~1.20",
+        "psr/container": "~1.0",
         "ramsey/uuid": "~3.0",
         "swiftmailer/swiftmailer": "~6.0",
         "symfony/console": "~3.3",
diff --git a/src/Illuminate/Container/Container.php b/src/Illuminate/Container/Container.php
index 8e33249153d4..2d275916c3c2 100755
--- a/src/Illuminate/Container/Container.php
+++ b/src/Illuminate/Container/Container.php
@@ -1222,4 +1222,24 @@ public function __set($key, $value)
     {
         $this[$key] = $value;
     }
+
+    /**
+     *  {@inheritdoc}
+     */
+    public function get($id)
+    {
+        if ($this->has($id)) {
+            return $this->resolve($id);
+        }
+
+        throw new EntryNotFoundException();
+    }
+
+    /**
+     *  {@inheritdoc}
+     */
+    public function has($id)
+    {
+        return $this->bound($id);
+    }
 }
diff --git a/src/Illuminate/Container/EntryNotFoundException.php b/src/Illuminate/Container/EntryNotFoundException.php
new file mode 100644
index 000000000000..bdcb6401d78c
--- /dev/null
+++ b/src/Illuminate/Container/EntryNotFoundException.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Illuminate\Container;
+
+use Exception;
+use Psr\Container\NotFoundExceptionInterface;
+
+class EntryNotFoundException extends Exception implements NotFoundExceptionInterface
+{
+}
diff --git a/src/Illuminate/Contracts/Container/BindingResolutionException.php b/src/Illuminate/Contracts/Container/BindingResolutionException.php
index dfedd9475a62..a69c24c5ba06 100644
--- a/src/Illuminate/Contracts/Container/BindingResolutionException.php
+++ b/src/Illuminate/Contracts/Container/BindingResolutionException.php
@@ -3,8 +3,9 @@
 namespace Illuminate\Contracts\Container;
 
 use Exception;
+use Psr\Container\ContainerExceptionInterface;
 
-class BindingResolutionException extends Exception
+class BindingResolutionException extends Exception implements ContainerExceptionInterface
 {
     //
 }
diff --git a/src/Illuminate/Contracts/Container/Container.php b/src/Illuminate/Contracts/Container/Container.php
index 5ebbbf0a50ae..44ae747d28f1 100644
--- a/src/Illuminate/Contracts/Container/Container.php
+++ b/src/Illuminate/Contracts/Container/Container.php
@@ -3,8 +3,9 @@
 namespace Illuminate\Contracts\Container;
 
 use Closure;
+use Psr\Container\ContainerInterface;
 
-interface Container
+interface Container extends ContainerInterface
 {
     /**
      * Determine if the given abstract type has been bound.
diff --git a/tests/Container/ContainerTest.php b/tests/Container/ContainerTest.php
index 8353cb60275f..4fe2da9f064a 100755
--- a/tests/Container/ContainerTest.php
+++ b/tests/Container/ContainerTest.php
@@ -969,6 +969,22 @@ public function testCanBuildWithoutParameterStackWithConstructors()
         $container->bind('Illuminate\Tests\Container\IContainerContractStub', 'Illuminate\Tests\Container\ContainerImplementationStub');
         $this->assertInstanceOf(ContainerDependentStub::class, $container->build(ContainerDependentStub::class));
     }
+
+    public function testContainerKnowsEntry()
+    {
+        $container = new Container;
+        $container->bind('Illuminate\Tests\Container\IContainerContractStub', 'Illuminate\Tests\Container\ContainerImplementationStub');
+        $this->assertEquals(true, $container->has('Illuminate\Tests\Container\IContainerContractStub'));
+    }
+
+    /**
+     * @expectedException \Illuminate\Container\EntryNotFoundException
+     */
+    public function testUnknownEntryThrowsException()
+    {
+        $container = new Container;
+        $container->get('Taylor');
+    }
 }
 
 class ContainerConcreteStub