diff --git a/lib/models/Site.dart b/lib/models/Site.dart
index f981b38..06432a3 100644
--- a/lib/models/Site.dart
+++ b/lib/models/Site.dart
@@ -206,6 +206,9 @@ class Site {
   Future<List<HostInfo>> listHostmap() async {
     try {
       var ret = await platform.invokeMethod("active.listHostmap", <String, String>{"id": id});
+      if (ret == null) {
+        return [];
+      }
 
       List<dynamic> f = jsonDecode(ret);
       List<HostInfo> hosts = [];
@@ -226,6 +229,9 @@ class Site {
   Future<List<HostInfo>> listPendingHostmap() async {
     try {
       var ret = await platform.invokeMethod("active.listPendingHostmap", <String, String>{"id": id});
+      if (ret == null) {
+        return [];
+      }
 
       List<dynamic> f = jsonDecode(ret);
       List<HostInfo> hosts = [];