diff --git a/lib/mongoid_geospatial/fields/point.rb b/lib/mongoid_geospatial/fields/point.rb
index 459576d..1509020 100644
--- a/lib/mongoid_geospatial/fields/point.rb
+++ b/lib/mongoid_geospatial/fields/point.rb
@@ -58,7 +58,7 @@ class << self
 
         # Database -> Object
         def demongoize(object)
-          # return unless object && !object.empty?
+          return unless object
           Point.new(*object)
         end
 
diff --git a/spec/mongoid_geospatial/fields/point_spec.rb b/spec/mongoid_geospatial/fields/point_spec.rb
index 2283614..0e9ac50 100644
--- a/spec/mongoid_geospatial/fields/point_spec.rb
+++ b/spec/mongoid_geospatial/fields/point_spec.rb
@@ -9,7 +9,7 @@
 
   it "should not fail if point is nil" do
     bar = Bar.create!(name: "Moe's")
-    bar.location.x.should be_nil
+    bar.location.should be_nil
   end
 
   describe "methods" do