diff --git a/Tusker/Screens/Notifications/NotificationsTableViewController.swift b/Tusker/Screens/Notifications/NotificationsTableViewController.swift
index 24e67261b6..ab5b59c2ac 100644
--- a/Tusker/Screens/Notifications/NotificationsTableViewController.swift
+++ b/Tusker/Screens/Notifications/NotificationsTableViewController.swift
@@ -57,7 +57,10 @@ class NotificationsTableViewController: TimelineLikeTableViewController<Notifica
     override func loadInitialItems(completion: @escaping ([NotificationGroup]) -> Void) {
         let request = Client.getNotifications(excludeTypes: excludedTypes)
         mastodonController.run(request) { (response) in
-            guard case let .success(notifications, pagination) = response else { fatalError() }
+            guard case let .success(notifications, pagination) = response else {
+                completion([])
+                return
+            }
             
             let groups = NotificationGroup.createGroups(notifications: notifications, only: self.groupTypes)
             
diff --git a/Tusker/Screens/Profile/ProfileStatusesViewController.swift b/Tusker/Screens/Profile/ProfileStatusesViewController.swift
index d1b73e4621..2934acd8cf 100644
--- a/Tusker/Screens/Profile/ProfileStatusesViewController.swift
+++ b/Tusker/Screens/Profile/ProfileStatusesViewController.swift
@@ -99,6 +99,7 @@ class ProfileStatusesViewController: TimelineLikeTableViewController<TimelineEnt
             guard case let .success(statuses, pagination) = response,
                   !statuses.isEmpty else {
                 // todo: error message
+                completion([])
                 return
             }