diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
index c7a75d3..957952b 100755
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -1,9 +1,13 @@
-<?php namespace App\Exceptions;
+<?php
+
+namespace App\Exceptions;
 
 use Exception;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
+use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
 
-class Handler extends ExceptionHandler {
+class Handler extends ExceptionHandler
+{
 
 	/**
 	 * A list of the exception types that should not be reported.
@@ -34,9 +38,16 @@ class Handler extends ExceptionHandler {
 	 * @param  \Exception  $e
 	 * @return \Illuminate\Http\Response
 	 */
+	// public function render($request, Exception $e)
+	// {
+	// 	return parent::render($request, $e);
+	// }
+
 	public function render($request, Exception $e)
 	{
+		if ($e instanceof MethodNotAllowedHttpException) {
+			abort(404);
+		}
 		return parent::render($request, $e);
 	}
-
 }
diff --git a/app/Http/Controllers/teamstore/TeamStoreController.php b/app/Http/Controllers/teamstore/TeamStoreController.php
index 8ef8494..83bf00c 100755
--- a/app/Http/Controllers/teamstore/TeamStoreController.php
+++ b/app/Http/Controllers/teamstore/TeamStoreController.php
@@ -32,6 +32,13 @@ class TeamStoreController extends Controller
 		$UserModel 	= new UserModel;
 
 		$store_array 	= $m->selectTeamStore('StoreUrl', $teamStoreURL);
+
+		if(count($store_array) <= 0) {
+			return view('merchbay.not_found')
+			->with('message', "Store not found");
+		}
+
+
 		// $product_array 	= $m->selectTeamStoreProducts('TeamStoreId', $store_array[0]->Id);
 
 		$q 		= $request->input('q');
@@ -252,6 +259,11 @@ class TeamStoreController extends Controller
 		$store_array 	= $m->selectTeamStore('StoreUrl', $teamStoreURL);
 		$product_array 	= $m->selectTeamStoreProducts('ProductURL', $productURL);
 
+		if(count($product_array) <= 0) {
+			return view('merchbay.not_found')
+			->with('message', "Store product not found");
+		}
+
 		$thumbnails_array 	= $m->getThumbnails($product_array[0]->Id);
 		$teams_array 	= $m->getTeams($product_array[0]->Id);
 		$selectRoster 	= $m->selectRoster($product_array[0]->Id);
diff --git a/resources/views/errors/404.blade.php b/resources/views/errors/404.blade.php
new file mode 100644
index 0000000..565915c
--- /dev/null
+++ b/resources/views/errors/404.blade.php
@@ -0,0 +1,26 @@
+@extends('merchbay_main')
+
+@section('main-content')
+<style>
+    .vh100 {
+        height: 100vh !important;
+    }
+</style>
+<div class="wrapper pb-5">
+    <div class="main__content">
+        <div class="container">
+            <div class="row justify-content-center">
+                <div class="col col-lg-8 pt-5 text-center text-lg-start">
+                    <h4>404 - Page not found</h4>
+                    <hr class="custom-hr" />
+                </div>
+            </div>
+            <div class="row justify-content-center">
+                <div class="col col-lg-8 vh100">
+                    <a href="{{ url('/') }}" class="btn btn-black btn-sm px-5">Back to homepage</a>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+@endsection
\ No newline at end of file
diff --git a/resources/views/merchbay/not_found.blade.php b/resources/views/merchbay/not_found.blade.php
new file mode 100644
index 0000000..d76c961
--- /dev/null
+++ b/resources/views/merchbay/not_found.blade.php
@@ -0,0 +1,27 @@
+@extends('merchbay_main')
+
+@section('main-content')
+<style>
+    .vh100 {
+        height: 100vh !important;
+    }
+</style>
+<div class="wrapper pb-5">
+    <div class="main__content">
+        <div class="container">
+            <div class="row justify-content-center">
+                <div class="col col-lg-8 pt-5 text-center text-lg-start">
+                    <h4>404 - Page not found</h4>
+                    <i>{{ $message }}</i>
+                    <hr class="custom-hr" />
+                </div>
+            </div>
+            <div class="row justify-content-center">
+                <div class="col col-lg-8 vh100">
+                    <a href="{{ url('/') }}" class="btn btn-black btn-sm px-5">Back to homepage</a>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+@endsection
\ No newline at end of file