diff --git a/lib/dao.js b/lib/dao.js
index 279b05ae..d9394963 100644
--- a/lib/dao.js
+++ b/lib/dao.js
@@ -396,10 +396,24 @@ DataAccessObject._coerce = function (where) {
         if (!DataType) {
           continue;
         }
+
+        if (DataType === geo.GeoPoint) {
+          // Skip the GeoPoint as the near operator breaks the assumption that
+          // an operation has only one property
+          // We should probably fix it based on
+          // http://docs.mongodb.org/manual/reference/operator/query/near/
+          // The other option is to make operators start with $
+          continue;
+        }
+
         var val = where[p];
         // Check there is an operator
         var operator = null;
-        if ('object' === typeof val && Object.keys(val).length === 1) {
+        if ('object' === typeof val) {
+            if (Object.keys(val).length !== 1) {
+              // Skip if there are not only one properties
+              continue;
+            }
             for (var op in operators) {
                 if (op in val) {
                     val = val[op];
@@ -455,6 +469,11 @@ DataAccessObject.find = function find(params, cb) {
     var constr = this;
     
     params = params || {};
+
+    if(params.where) {
+        params.where = this._coerce(params.where);
+    }
+
     var fields = params.fields;
     var near = params && geo.nearFilter(params.where);
     var supportsGeo = !!this.getDataSource().connector.buildNearFilter;
@@ -465,9 +484,6 @@ DataAccessObject.find = function find(params, cb) {
     }
 
     params = removeUndefined(params);
-    if(params.where) {
-        params.where = this._coerce(params.where);
-    }
     if(near) {
       if(supportsGeo) {
         // convert it
diff --git a/lib/geo.js b/lib/geo.js
index 6a43e4af..580308a7 100644
--- a/lib/geo.js
+++ b/lib/geo.js
@@ -106,8 +106,8 @@ function GeoPoint(data) {
   }
   
   assert(typeof data === 'object', 'must provide a lat and lng object when creating a GeoPoint');
-  assert(typeof data.lat === 'number', 'lat must be a number when creating a GeoPoint');
-  assert(typeof data.lng === 'number', 'lng must be a number when creating a GeoPoint');
+  assert(typeof data.lat === 'number' && !isNaN(data.lat), 'lat must be a number when creating a GeoPoint');
+  assert(typeof data.lng === 'number' && !isNaN(data.lng), 'lng must be a number when creating a GeoPoint');
   assert(data.lng <= 180, 'lng must be <= 180');
   assert(data.lng >= -180, 'lng must be >= -180');
   assert(data.lat <= 90, 'lat must be <= 90');
diff --git a/test/loopback-dl.test.js b/test/loopback-dl.test.js
index f324b97d..488c7c86 100644
--- a/test/loopback-dl.test.js
+++ b/test/loopback-dl.test.js
@@ -582,6 +582,7 @@ describe('DataAccessObject', function () {
       age: Number,
       vip: Boolean,
       date: Date,
+      location: 'GeoPoint',
       scores: [Number]
     });
   });
@@ -647,6 +648,12 @@ describe('DataAccessObject', function () {
     assert.deepEqual(where, {vip: false});
 
   });
+
+  it('should skip GeoPoint', function () {
+    where = model._coerce({location: {near: {lng: 10, lat: 20}, maxDistance: 20}});
+    assert.deepEqual(where, {location: {near: {lng: 10, lat: 20}, maxDistance: 20}});
+  });
+
 });
 
 describe('Load models from json', function () {