diff --git a/lib/Ratchet/Application/Server/App.php b/lib/Ratchet/Application/Server/App.php
index 5964f39..8eb8fb0 100644
--- a/lib/Ratchet/Application/Server/App.php
+++ b/lib/Ratchet/Application/Server/App.php
@@ -41,11 +41,7 @@ class App implements ApplicationInterface {
      */
     protected $_run = true;
 
-    public function __construct(ApplicationInterface $application = null) {
-        if (null === $application) {
-            throw new \UnexpectedValueException("Server requires an application to run off of");
-        }
-
+    public function __construct(ApplicationInterface $application) {
         $this->_app = $application;
     }
 
diff --git a/lib/Ratchet/Application/WebSocket/App.php b/lib/Ratchet/Application/WebSocket/App.php
index 362039c..c0454e4 100644
--- a/lib/Ratchet/Application/WebSocket/App.php
+++ b/lib/Ratchet/Application/WebSocket/App.php
@@ -41,11 +41,7 @@ class App implements ApplicationInterface, ConfiguratorInterface {
 
     protected $_mask_payload = false;
 
-    public function __construct(ApplicationInterface $app = null) {
-        if (null === $app) {
-            throw new \UnexpectedValueException("WebSocket requires an application to run");
-        }
-
+    public function __construct(ApplicationInterface $app) {
         $this->_app     = $app;
         $this->_factory = new Factory;
     }
diff --git a/lib/Ratchet/Application/WebSocket/WebSocketAppInterface.php b/lib/Ratchet/Application/WebSocket/WebSocketAppInterface.php
index f78ca6c..642a625 100644
--- a/lib/Ratchet/Application/WebSocket/WebSocketAppInterface.php
+++ b/lib/Ratchet/Application/WebSocket/WebSocketAppInterface.php
@@ -12,7 +12,7 @@ interface WebSocketAppInterface extends ApplicationInterface {
      * Currently instead of this, I'm setting header in the Connection object passed around...not sure which I like more
      * @param string
      */
-    function setHeaders($headers);
+    //function setHeaders($headers);
 
     /**
      * @return string
diff --git a/tests/Ratchet/Tests/Application/Server/AppTest.php b/tests/Ratchet/Tests/Application/Server/AppTest.php
index a9e96a6..4e3aed6 100644
--- a/tests/Ratchet/Tests/Application/Server/AppTest.php
+++ b/tests/Ratchet/Tests/Application/Server/AppTest.php
@@ -36,11 +36,6 @@ class AppTest extends \PHPUnit_Framework_TestCase {
         return array_pop($connections);
     }
 
-    public function testDoNotAllowStacklessServer() {
-        $this->setExpectedException('UnexpectedValueException');
-        new ServerApp;
-    }
-
     public function testOnOpenPassesClonedSocket() {
         $this->_server->run($this->_catalyst);
         $master = $this->getMasterConnection();