diff --git a/src/app/context/CurrentLocationContext.js b/src/app/context/CurrentLocationContext.js
index ec626da..9c89e8c 100644
--- a/src/app/context/CurrentLocationContext.js
+++ b/src/app/context/CurrentLocationContext.js
@@ -36,10 +36,14 @@ const CurrentLocationProvider = ({ children }) => {
     const getAddress = async (coordenadas) => {
       //  console.log("PEGANDO ENDEREÇO");
         Location.setGoogleApiKey("AIzaSyD_wuuokS3SVczc8qSASrsBq0E5qIpdyMc");
+        
 
         const address = await Location.reverseGeocodeAsync(coordenadas);
         if (address[0] != undefined) {
-            setCurrentLocation(address[0].street + ", " + address[0].name + "\n" + address[0].district, coordenadas.x);
+            var street = (address[0].street == null ? "" : address[0].street);
+            var number = (address[0].name == null ? "" : address[0].name);
+            var district = (address[0].district == null ? "" : address[0].district);
+            setCurrentLocation(street + ", "+ number + "\n" + district , coordenadas.x);
         }
         else{//Quando o usuário não da permissão de acesso da localização o geoCode retorna um array vazio
             setCurrentLocation("Erro ao carregar localização", coordenadas.x);
diff --git a/src/app/screens/MapFormScreen.js b/src/app/screens/MapFormScreen.js
index 48b4c33..98f0636 100644
--- a/src/app/screens/MapFormScreen.js
+++ b/src/app/screens/MapFormScreen.js
@@ -22,11 +22,11 @@ const MapFormScreen = (props) => {
     Location.setGoogleApiKey("AIzaSyD_wuuokS3SVczc8qSASrsBq0E5qIpdyMc");
 
     const address = await Location.reverseGeocodeAsync(coordenadas);
-    if (address[0] != undefined) {
-      context.saveNewLocation(
-        address[0].street + ", " + address[0].name + "\n" + address[0].district,
-        coordenadas
-      );
+    if (address[0] != undefined) {      
+      var street = (address[0].street == null ? "" : address[0].street);
+      var number = (address[0].name == null ? "" : address[0].name);
+      var district = (address[0].district == null ? "" : address[0].district);
+      context.saveNewLocation(street + ", " + number + "\n" + district, coordenadas);
     } else {
       //Quando o usuário não da permissão de acesso da localização o geoCode retorna um array vazio
       context.saveNewLocation("Erro ao carregar endereço", coordenadas);