Bad artist name error fix. showing 404

app/controllers/artist_controller.rb

@@ -2,13 +2,17 @@
 class ArtistController < ApplicationController
   require 'open-uri'
 	def view
+	  # Dirty auth block START
     unless request.session['session_id'].nil? or MainController.logged_in request.session['session_id']
       redirect_to '/login'
+      return
     else
       if request.session['session_id'].nil?
         redirect_to '/login'
+        return
       end
     end
+    # Dirty auth block END
   	if params[:name].nil?
 	  	name = ''
   	else
@@ -18,6 +22,9 @@ class ArtistController < ApplicationController
   		name = params[:name].gsub('+', ' ')
   	end
   	@artist = Artist.getByName(name)
+  	if @artist.nil?
+  	  render :file => "#{Rails.root}/public/404.html", :status => 404, :layout => false
+  	else
 		  @albums = []
 		  @artist.albums.each do |album|
 			  unless album.releases.empty?
@@ -29,7 +36,7 @@ class ArtistController < ApplicationController
 	  		  end
 	  	  end
 	    end
-
+    end
 	def autocomplete
 		autocomplete = Artist.getLastFmAutocomplete(params[:query])
 		return	render :nothing => true if autocomplete.nil?