diff --git a/app/scripts/app.js b/app/scripts/app.js
index c2bd820..baf2be6 100644
--- a/app/scripts/app.js
+++ b/app/scripts/app.js
@@ -226,7 +226,8 @@ require(['jquery',
 
             // if there are no results, try searching for Cambridge
             if (!results.length) {
-                geocoder.geocode({ address: address + ' Cambridge, MA' }, function(results, status) {
+				if((/(cambridge,?\s*ma)+/i).test(address)){
+					geocoder.geocode({ address: address + ' Cambridge, MA' }, function(results, status) {
                     results = $.grep(results, addressIsCambridgeStreetAddress);
                     if (!results.length) {
                         $('#notice')
@@ -236,7 +237,12 @@ require(['jquery',
                         displaySearchResults(results);
                         google.maps.event.trigger(map, 'resize');
                     }
-                });
+                });	
+				}else{
+					 $('#notice')
+                            .addClass('error')
+                            .html($('#noLocation').text());
+				}
             } else {
                 displaySearchResults(results);
                 google.maps.event.trigger(map, 'resize');