diff --git a/lib/vehicles/hooks/issues_show_hook_listener.rb b/lib/vehicles/hooks/issues_show_hook_listener.rb
index 377d140..4a80fa9 100644
--- a/lib/vehicles/hooks/issues_show_hook_listener.rb
+++ b/lib/vehicles/hooks/issues_show_hook_listener.rb
@@ -19,7 +19,7 @@ module Vehicles
         context[:controller].send(:render_to_string, {
           partial: 'issues/show_issue_view_right',
             locals: {
-              vehicle: link_to(context[:issue].vehicle), 
+              vehicle: context[:issue].vehicle ? link_to(context[:issue].vehicle) : nil, 
               split_vin: context[:issue].vehicle ? context[:issue].vehicle.vin.to_s.scan(/.{1,9}/) : nil,
               notes: context[:issue].vehicle ? context[:issue].vehicle.notes : nil
             }