diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb
index 4dfe35f4..c1ea0566 100644
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@@ -5,8 +5,13 @@ module Gitlab
     end
 
     def user_project
-      @project ||=  current_user.projects.find_by_id(params[:id]) ||
-                    current_user.projects.find_by_code(params[:id])
+      if @project ||= current_user.projects.find_by_id(params[:id]) ||
+                      current_user.projects.find_by_code(params[:id])
+      else
+        error!({'message' => '404 Not found'}, 404)
+      end
+
+      @project
     end
 
     def authenticate!
diff --git a/spec/api/projects_spec.rb b/spec/api/projects_spec.rb
index 92a25543..8852a0d3 100644
--- a/spec/api/projects_spec.rb
+++ b/spec/api/projects_spec.rb
@@ -36,6 +36,12 @@ describe Gitlab::API do
       response.status.should == 200
       json_response['name'].should == project.name
     end
+
+    it "should return a 404 error if not found" do
+      get "#{api_prefix}/projects/42?private_token=#{user.private_token}"
+      response.status.should == 404
+      json_response['message'].should == '404 Not found'
+    end
   end
 
   describe "GET /projects/:id/repository/branches" do