diff --git a/app/controllers/admin/base_controller.rb b/app/controllers/admin/base_controller.rb
index 09460d8986..65e54ffff2 100644
--- a/app/controllers/admin/base_controller.rb
+++ b/app/controllers/admin/base_controller.rb
@@ -8,6 +8,14 @@ class Admin::BaseController < ApplicationController
 
   private
 
+  def parse_date_time(str)
+    begin
+      DateTime.strptime(str, "%B %e, %Y %I:%M %p GMT%z").utc
+    rescue
+      Time.parse(str).utc rescue nil
+    end
+  end
+
   def update_settings_with!(params)
     Blog.transaction do
       params[:setting].each { |k,v| this_blog.send("#{k.to_s}=", v) }
diff --git a/app/controllers/admin/content_controller.rb b/app/controllers/admin/content_controller.rb
index f2d8236285..91ba1a127b 100644
--- a/app/controllers/admin/content_controller.rb
+++ b/app/controllers/admin/content_controller.rb
@@ -149,14 +149,6 @@ def set_the_flash
 
   private
 
-  def parse_date_time(str)
-    begin
-      DateTime.strptime(str, "%B %e, %Y %I:%M %p GMT%z").utc
-    rescue
-      Time.parse(str).utc rescue nil
-    end
-  end
-
   def load_resources
     @post_types = PostType.find(:all)
     @images = Resource.images_by_created_at.page(params[:page]).per(10)
diff --git a/app/controllers/admin/notes_controller.rb b/app/controllers/admin/notes_controller.rb
index 130ae0ff8f..c3dc5f5e97 100644
--- a/app/controllers/admin/notes_controller.rb
+++ b/app/controllers/admin/notes_controller.rb
@@ -1,6 +1,6 @@
 module Admin; end
 
-class Admin::NotesController < Admin::ContentController
+class Admin::NotesController < Admin::BaseController
   layout "administration"
   cache_sweeper :blog_sweeper
   
diff --git a/spec/controllers/admin/notes_controller_spec.rb b/spec/controllers/admin/notes_controller_spec.rb
index 112931e400..33db25d0d2 100644
--- a/spec/controllers/admin/notes_controller_spec.rb
+++ b/spec/controllers/admin/notes_controller_spec.rb
@@ -79,6 +79,16 @@
         it {expect(response).to redirect_to(controller: 'notes', action: 'new')}
         it {expect(Note.count).to eq(2) }
       end
+      
+      context "With missing params" do
+        before :each do 
+          Note.delete_all
+          post :new, note: { }
+        end
+        
+        it {expect(response).to render_template(controller: 'notes', action: 'edit')}
+        it {expect(Note.count).to eq(0) }
+      end
     end
   end