diff --git a/lib/services/location_service.dart b/lib/services/location_service.dart
index 94737ef7c..fc56dd2d1 100644
--- a/lib/services/location_service.dart
+++ b/lib/services/location_service.dart
@@ -206,11 +206,11 @@ class GPSData {
   GPSData(this.latRef, this.lat, this.longRef, this.long);
 
   Location? toLocationObj() {
-    if (lat == null || long == null || latRef == null || longRef == null) {
+    if (lat == null || long == null) {
       return null;
     } else {
-      final latSign = (latRef == "N" ? 1 : -1);
-      final longSign = (longRef == "E" ? 1 : -1);
+      final latSign = (latRef ?? 'N') == "N" ? 1 : -1;
+      final longSign = (longRef ?? 'E') == "E" ? 1 : -1;
       return Location(
         latitude: latSign * lat![0] + lat![1] / 60 + lat![2] / 3600,
         longitude: longSign * long![0] + long![1] / 60 + long![2] / 3600,