diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 14a19ec..36d9c4c 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -8,6 +8,7 @@ class ProjectsController < ApplicationController
   # GET /projects/new
   def new
     @project = Project.new
+    @project_image = ProjectImage.new
   end
 
   # GET /projects
@@ -31,7 +32,7 @@ class ProjectsController < ApplicationController
   def show
     set_project
     @project_repositories = @project.repositories
-    @project_image = ProjectImage.find_by_project_id(@project.id).image_url
+    @project_image = ProjectImage.find_by_project_id(@project.id)
   end
 
   # GET /projects/1/edit
@@ -98,13 +99,19 @@ class ProjectsController < ApplicationController
       if url.blank?
         url = "no-image-available.png"
       end
-      ProjectImage.find_by_project_id(project_id).update(image_url: url)
+      @project_image = ProjectImage.find_by_project_id(project_id)
+      if !@project_image.blank?
+        @project_image.update(image_url: url)
+      end
     end
 
     def check_no_image project_id
-      @project_image = ProjectImage.find_by_project_id(project_id).image_url
-      if @project_image == "no-image-available.png"
-        @project_image = ""
+      @project_image = ProjectImage.find_by_project_id(project_id)
+
+      if !@project_image.blank?
+         if @project_image.image_url == "no-image-available.png"
+           @project_image.image_url = ""
+         end
       end
     end
 
diff --git a/app/views/projects/_form.html.erb b/app/views/projects/_form.html.erb
index ec09d74..8edff67 100644
--- a/app/views/projects/_form.html.erb
+++ b/app/views/projects/_form.html.erb
@@ -20,7 +20,7 @@
     <div class="form-row">
       <div class="field-container">
         <%= f.label "Image url", class: 'control-label' %><br>
-        <%= f.text_field :image_url, class: 'text-area', value: @project_image %>
+        <%= f.text_field :image_url, class: 'text-area' ,value: @project_image.image_url %>
       </div>
     </div>
 
diff --git a/app/views/projects/edit.html.erb b/app/views/projects/edit.html.erb
index d6f0451..129a924 100644
--- a/app/views/projects/edit.html.erb
+++ b/app/views/projects/edit.html.erb
@@ -3,11 +3,3 @@
 </div>
 
 <%= render 'form' %>
-
-<div class="page-header">
-  <div class="media">
-    <a class="pull-left">
-      <%=  image_tag "#{@project_image}", size:"64x64" %>
-    </a>
-  </div>
-</div>
diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb
index a5ab908..5316914 100644
--- a/app/views/projects/show.html.erb
+++ b/app/views/projects/show.html.erb
@@ -2,7 +2,7 @@
 <div class="page-header">
   <div class="media">
     <a class="pull-left">
-      <%=  image_tag "#{@project_image}", size:"64x64" %>
+      <%=  image_tag "#{@project_image.image_url}", size:"64x64" %>
     </a>
     <div class="media-body">
       <h4 class="media-heading">
diff --git a/spec/factories/projects.rb b/spec/factories/projects.rb
index 3a59dd4..0198609 100644
--- a/spec/factories/projects.rb
+++ b/spec/factories/projects.rb
@@ -5,6 +5,7 @@ FactoryGirl.define do
     id 1
     name "QT Calculator"
     description "A simple calculator for us."
+    image_url "example"
   end
 
   factory :another_project, class: Project do
--
libgit2 0.21.2