From ec56b59d578760e06ad123b74291f7ec365a3497 Mon Sep 17 00:00:00 2001
From: Rick Barrette <rickbarrette@gmail.com>
Date: Wed, 11 May 2016 09:23:35 -0400
Subject: [PATCH] Update vehicles_controller.rb

---
 app/controllers/vehicles_controller.rb | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/app/controllers/vehicles_controller.rb b/app/controllers/vehicles_controller.rb
index a73b422..bc46ac5 100644
--- a/app/controllers/vehicles_controller.rb
+++ b/app/controllers/vehicles_controller.rb
@@ -41,17 +41,21 @@ class VehiclesController < ApplicationController
   
   # display a specific vehicle
   def show
-    @vehicle = Vehicle.find_by_id(params[:id])
-    if not @vehicle
-      flash[:error] = "Vehicle Not Found"
-      redirect_to :index
+    begin
+      @vehicle = Vehicle.find_by_id(params[:id])
+    rescue ActiveRecord::RecordNotFound
+      render_404
     end
   end
   
   # return an HTML form for editing a vehicle
   def edit
-    @vehicle = Vehicle.find_by_id(params[:id])
-    @customers = Customer.all.order(:name)
+    begin
+      @vehicle = Vehicle.find_by_id(params[:id])
+      @customers = Customer.all.order(:name)
+    rescue ActiveRecord::RecordNotFound
+      render_404
+    end
   end
   
   # update a specific vehicle
@@ -72,10 +76,10 @@ class VehiclesController < ApplicationController
     begin
       Vehicle.find_by_id(params[:id]).destroy
       flash[:notice] = "Vehicle deleted successfully"
-    rescue
-      flash[:error] = "No Vehicle Found"
+      redirect_to action: :index
+    rescue ActiveRecord::RecordNotFound
+      render_404
     end
-    redirect_to action: :index
   end
 
 end