diff --git a/service/service.py b/service/service.py
index 8c2fa25..22e5801 100644
--- a/service/service.py
+++ b/service/service.py
@@ -44,10 +44,15 @@ class PointService:
                 models.PrePlacementPoint.objects.create(address=addr, matching_status=MatchingStatus.Error.name)
                 problem += 1
                 continue
-            coords = response[0]['position']
+            coords = response[0].get('position')
+            if not coords:
+                models.PrePlacementPoint.objects.create(address=addr, matching_status=MatchingStatus.Error.name)
+                problem += 1
+                continue
             wkt = "POINT(" + str(coords['lng']) + " " + str(coords['lat']) + ")"
             response = response[0]['address']
             obj = models.PlacementPoint.objects.filter(street=response['street'], house_number=response['houseNumber'],
+                                                       subject_rf=response.get('state'),city=response['city'],is_vis=True,
                                                        category=cat).values().first()
             if obj:
                 obj.pop('id')
@@ -58,7 +63,6 @@ class PointService:
                                                         house_number=response['houseNumber'],
                                                         category=cat, geometry=wkt,
                                                         matching_status=MatchingStatus.New.name)
-        models.TempFiles.objects.all().delete()
         return total, matched, problem
 
     @staticmethod