diff --git a/src/ControllerResolver.php b/src/ControllerResolver.php
index 809c91f..a1625f7 100644
--- a/src/ControllerResolver.php
+++ b/src/ControllerResolver.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Argument Resolver Class
+ * Controller Resolver Class
  *
  * @author : Pranjal Pandey
  */
diff --git a/src/NotFoundException.php b/src/NotFoundException.php
index af5de8a..ea624a5 100644
--- a/src/NotFoundException.php
+++ b/src/NotFoundException.php
@@ -7,6 +7,11 @@
  */
 namespace Scrawler\Router;
 
-class NotFoundException extends \Exception{
+use Throwable;
 
+class NotFoundException extends \Exception {
+    public function __construct(string $message = "", int $code = 0, Throwable $previous = null) {
+        http_response_code(404);
+        parent::__construct($message, $code, $previous);
+    }
 }
diff --git a/src/RouterEngine.php b/src/RouterEngine.php
index 630aa36..7c8ab36 100644
--- a/src/RouterEngine.php
+++ b/src/RouterEngine.php
@@ -70,15 +70,10 @@ public function route() {
         $this->path_info = $this->request->getPathInfo();
 
         //Break URL into segments
-        if ($this->path_info === 'Index.php') {
-            $this->path_info = '/';
-        }
-
         $this->path_info = explode('/', $this->path_info);
         array_shift($this->path_info);
 
 
-
         //Set corrosponding controller
         if (isset($this->path_info[0]) && !empty($this->path_info[0])) {
             $this->controller = $this->collection->getController(ucfirst($this->path_info[0]));
@@ -97,7 +92,7 @@ public function route() {
             $this->method = $this->getMethod($this->controller);
             $this->request->attributes->set('_controller',$this->controller.'::'.$this->method);
           }else{
-            $this->error('No Controller could be found');
+            $this->error('No Controller could be resolved');
           }
             }
             $this->setArguments();
@@ -111,11 +106,6 @@ public function route() {
      *@param string $message
      */
     protected function error($message) {
-        $controllers = $this->collection->getControllers();
-        $list="";
-        foreach($controllers as $name => $class){
-        $list = $list.''.$name.':'.$class;
-        }
 
         throw new NotFoundException('Oops its an 404 error! :'.$message);
     }
@@ -181,7 +171,7 @@ private function getMethod($controller) {
             } elseif (method_exists($controller, 'allIndex')) {
                 return 'allIndex';
             } else {
-                $this->error('The index method could not be found in given controller');
+                $this->error('The allIndex method you are looking for is not found in '.$controller.' controller');
             }
         }
     }
@@ -198,7 +188,7 @@ public function getRoutedController(){
     }
 
 //----------------------------------------------------------------//
-    /*
+    /**
      * Returns the method to be called
      *
      * @return String