diff --git a/lib/pages/chat/message_detail.dart b/lib/pages/chat/message_detail.dart
index d1b7144..74d352d 100644
--- a/lib/pages/chat/message_detail.dart
+++ b/lib/pages/chat/message_detail.dart
@@ -180,7 +180,7 @@ class MessageDetail extends StatelessWidget {
         message.messageID != "") {
       PackageModel packageModel =
           Provider.of<PackageModel>(context, listen: false);
-      Package p = await packageModel.getPackage(message.messageID!);
+      Package? p = await packageModel.getPackage(message.messageID!);
       if (p == null) return;
       Navigator.push<bool>(context,
           CupertinoPageRoute(builder: (context) => PackageInfo(package: p)));
@@ -206,7 +206,7 @@ class MessageDetail extends StatelessWidget {
         message.messageID != "") {
       ShipmentModel shipmentModel =
           Provider.of<ShipmentModel>(context, listen: false);
-      Shipment s = await shipmentModel.getShipment(message.messageID!);
+      Shipment? s = await shipmentModel.getShipment(message.messageID!);
       if (s == null) return;
       await Navigator.push<bool>(
           context,
diff --git a/lib/pages/main/home_page.dart b/lib/pages/main/home_page.dart
index 1f81ac0..1e1b88d 100644
--- a/lib/pages/main/home_page.dart
+++ b/lib/pages/main/home_page.dart
@@ -533,7 +533,7 @@ class _HomePageState extends State<HomePage> {
       String term = _searchCtl.text;
       if (term == null || term.trim() == "") return;
       var packageModel = Provider.of<PackageModel>(context, listen: false);
-      Package package = await packageModel.lookupPackage(term);
+      Package? package = await packageModel.lookupPackage(term);
       if (package == null) {
         showMsgDialog(context, "Not found", "Tracking ID - '$term' not found!");
         return;
diff --git a/lib/pages/widgets/multi_img_controller.dart b/lib/pages/widgets/multi_img_controller.dart
index 26191ed..ad0be39 100644
--- a/lib/pages/widgets/multi_img_controller.dart
+++ b/lib/pages/widgets/multi_img_controller.dart
@@ -80,7 +80,7 @@ class MultiImgController {
 
   List<File?> get getUpdatedFile {
     List<File?> _addfiles = getAddedFile;
-    this.imageFiles!.addAll(_addfiles);
+    this.imageFiles.addAll(_addfiles);
     return this.imageFiles;
   }