diff --git a/lib/pages/package/model/package_model.dart b/lib/pages/package/model/package_model.dart
index 4878bc6..a826954 100644
--- a/lib/pages/package/model/package_model.dart
+++ b/lib/pages/package/model/package_model.dart
@@ -143,7 +143,7 @@ class PackageModel extends BaseModel {
           await FirebaseFirestore.instance.collection("$path").doc(id).get();
       if (snap.exists) {
         var package =
-            Package.fromMap(snap.data as Map<String, dynamic>, snap.id);
+            Package.fromMap(snap.data() as Map<String, dynamic>, snap.id);
         return package;
       }
     } catch (e) {
diff --git a/lib/pages/widgets/delivery_address_selection.dart b/lib/pages/widgets/delivery_address_selection.dart
index 1f1b0a6..22f6d79 100644
--- a/lib/pages/widgets/delivery_address_selection.dart
+++ b/lib/pages/widgets/delivery_address_selection.dart
@@ -61,9 +61,10 @@ class _DeliveryAddressSelectionState extends State<DeliveryAddressSelection> {
         ),
         floatingActionButton: FloatingActionButton.extended(
           onPressed: () async {
-            bool updated = await Navigator.of(context).push(CupertinoPageRoute(
+            bool? updated = await Navigator.of(context).push(CupertinoPageRoute(
                 builder: (context) =>
                     DeliveryAddressEditor(user: widget.user)));
+            if (updated == null) return;
             if (updated) {
               _getDeliverAddresses();
             }