diff --git a/Classes/Image Upload/ImageUploadTableViewController.swift b/Classes/Image Upload/ImageUploadTableViewController.swift
index 0517c21b7..dddbc89bb 100755
--- a/Classes/Image Upload/ImageUploadTableViewController.swift	
+++ b/Classes/Image Upload/ImageUploadTableViewController.swift	
@@ -189,8 +189,8 @@ class ImageUploadTableViewController: UITableViewController {
                 description: "") { [weak self] result in
 
                 switch result {
-                case .error:
-                    Squawk.showGenericError()
+                case .error(let error):
+                    Squawk.show(error: error)
                     self?.setRightBarItemIdle()
 
                 case .success(let link):
diff --git a/Classes/Issues/AddCommentClient.swift b/Classes/Issues/AddCommentClient.swift
index 6a60fdee0..4df82244d 100644
--- a/Classes/Issues/AddCommentClient.swift
+++ b/Classes/Issues/AddCommentClient.swift
@@ -61,11 +61,11 @@ final class AddCommentClient {
                         viewerCanDelete: fragments.deletableFields.viewerCanDelete
                     )
                 }
-            case .failure:
+            case .failure(let error):
                 for listener in self.listeners {
                     listener.listener?.didFailSendingComment(client: self, subjectId: subjectId, body: body)
                 }
-                Squawk.showGenericError()
+                Squawk.show(error: error)
             }
         }
     }
diff --git a/Classes/Issues/Comments/IssueCommentSectionController.swift b/Classes/Issues/Comments/IssueCommentSectionController.swift
index e37d673d5..fe2751040 100644
--- a/Classes/Issues/Comments/IssueCommentSectionController.swift
+++ b/Classes/Issues/Comments/IssueCommentSectionController.swift
@@ -261,11 +261,10 @@ final class IssueCommentSectionController:
             commentID: "\(number)")
         ) { [weak self] result in
             switch result {
-            case .failure:
+            case .failure(let error):
                 self?.hasBeenDeleted = false
                 self?.update(animated: trueUnlessReduceMotionEnabled)
-
-                Squawk.showGenericError()
+                Squawk.show(error: error)
             case .success: break // Don't need to handle success since updated optimistically
             }
         }
@@ -297,9 +296,9 @@ final class IssueCommentSectionController:
         ) { [weak self] result in
             switch result {
             case .success: break
-            case .failure:
+            case .failure(let error):
                 self?.edit(markdown: originalMarkdown)
-                Squawk.showGenericError()
+                Squawk.show(error: error)
             }
         }
     }
diff --git a/Classes/Issues/EditComment/EditCommentViewController.swift b/Classes/Issues/EditComment/EditCommentViewController.swift
index 1a00efec3..1f5ff0d4f 100644
--- a/Classes/Issues/EditComment/EditCommentViewController.swift
+++ b/Classes/Issues/EditComment/EditCommentViewController.swift
@@ -173,7 +173,9 @@ MessageTextViewListener {
         ) { [weak self] result in
             switch result {
             case .success: self?.didSave(markdown: markdown)
-            case .failure: self?.error()
+            case .failure(let error):
+                self?.setRightBarItemIdle()
+                Squawk.show(error: error)
             }
         }
     }
@@ -183,11 +185,6 @@ MessageTextViewListener {
         delegate?.didEditComment(viewController: self, markdown: markdown)
     }
 
-    func error() {
-        setRightBarItemIdle()
-        Squawk.showGenericError()
-    }
-
     // MARK: MessageTextViewListener
 
     func didChange(textView: MessageTextView) {
diff --git a/Classes/Issues/GithubClient+Issues.swift b/Classes/Issues/GithubClient+Issues.swift
index bf5e8b080..3c6b67a69 100644
--- a/Classes/Issues/GithubClient+Issues.swift
+++ b/Classes/Issues/GithubClient+Issues.swift
@@ -59,9 +59,9 @@ extension GithubClient {
 
         client.query(query, result: { $0.repository }) { result in
             switch result {
-            case .failure:
-                completion(.error(nil))
-                Squawk.showGenericError()
+            case .failure(let error):
+                completion(.error(error))
+                Squawk.show(error: error)
             case .success(let repository):
                 let issueOrPullRequest = repository.issueOrPullRequest
                 guard let issueType: IssueType = issueOrPullRequest?.asIssue ?? issueOrPullRequest?.asPullRequest else {
@@ -193,13 +193,9 @@ extension GithubClient {
             switch result {
             case .success(let data):
                 completion(createIssueReactions(reactions: data))
-            case .failure(let err):
+            case .failure(let error):
                 completion(nil)
-                if let message = err?.localizedDescription {
-                    Squawk.showError(message: message)
-                } else {
-                    Squawk.showGenericError()
-                }
+                Squawk.show(error: error)
             }
         }
 
@@ -252,9 +248,9 @@ extension GithubClient {
         client.send(V3SetIssueStatusRequest(owner: owner, repo: repo, number: number, state: stateString)) { result in
             switch result {
             case .success: break
-            case .failure:
+            case .failure(let error):
                 cache.set(value: previous)
-                Squawk.showGenericError()
+                Squawk.show(error: error)
             }
         }
     }
@@ -294,10 +290,10 @@ extension GithubClient {
             switch result {
             case .success:
                 completion?(.success(true))
-            case .failure:
+            case .failure(let error):
                 cache.set(value: previous)
-                Squawk.showGenericError()
-                completion?(.error(nil))
+                Squawk.show(error: error)
+                completion?(.error(error))
             }
         }
     }
@@ -405,9 +401,9 @@ extension GithubClient {
         ) { result in
             switch result {
             case .success: break
-            case .failure:
+            case .failure(let error):
                 cache.set(value: previous)
-                Squawk.showGenericError()
+                Squawk.show(error: error)
             }
         }
     }
@@ -503,9 +499,9 @@ extension GithubClient {
             ) { result in
                 switch result {
                 case .success: break
-                case .failure:
+                case .failure(let error):
                     cache.set(value: previous)
-                    Squawk.showGenericError()
+                    Squawk.show(error: error)
                 }
             }
         }
@@ -523,9 +519,9 @@ extension GithubClient {
             ) { result in
                 switch result {
                 case .success: break
-                case .failure:
+                case .failure(let error):
                     cache.set(value: previous)
-                    Squawk.showGenericError()
+                    Squawk.show(error: error)
                 }
             }
         }
diff --git a/Classes/Issues/IssuesViewController.swift b/Classes/Issues/IssuesViewController.swift
index 7210f3b2c..b7b7a0013 100644
--- a/Classes/Issues/IssuesViewController.swift
+++ b/Classes/Issues/IssuesViewController.swift
@@ -304,8 +304,8 @@ final class IssuesViewController:
                     }
                     // avoid finishLoading() so empty view doesn't appear
                     self?.feed.adapter.performUpdates(animated: trueUnlessReduceMotionEnabled)
-                case .error:
-                    Squawk.showGenericError()
+                case .error(let error):
+                    Squawk.show(error: error)
                 }
             }
         }
diff --git a/Classes/Issues/Merge/GithubClient+Merge.swift b/Classes/Issues/Merge/GithubClient+Merge.swift
index 459ddcb9a..b57ee6f3b 100644
--- a/Classes/Issues/Merge/GithubClient+Merge.swift
+++ b/Classes/Issues/Merge/GithubClient+Merge.swift
@@ -54,8 +54,8 @@ extension GithubClient {
             switch result {
             case .success:
                 cache.set(value: optimisticResult)
-            case .failure:
-                Squawk.showGenericError()
+            case .failure(let err):
+                Squawk.show(error: err)
                 error()
             }
         }
diff --git a/Classes/Labels/LabelsViewController.swift b/Classes/Labels/LabelsViewController.swift
index 74eebc8af..d3521b1f4 100644
--- a/Classes/Labels/LabelsViewController.swift
+++ b/Classes/Labels/LabelsViewController.swift
@@ -68,8 +68,8 @@ final class LabelsViewController: BaseListViewController2<String>, BaseListViewC
                     return RepositoryLabel(color: node.color, name: node.name)
                 }.sorted { $0.name < $1.name }
                 self?.update(animated: true)
-            case .failure:
-                Squawk.showGenericError()
+            case .failure(let error):
+                Squawk.show(error: error)
             }
         }
     }
diff --git a/Classes/Milestones/GithubClient+Milestones.swift b/Classes/Milestones/GithubClient+Milestones.swift
index a57871763..690a9189e 100644
--- a/Classes/Milestones/GithubClient+Milestones.swift
+++ b/Classes/Milestones/GithubClient+Milestones.swift
@@ -97,9 +97,9 @@ extension GithubClient {
         ) { result in
             switch result {
             case .success: break
-            case .failure:
+            case .failure(let error):
                 cache.set(value: previous)
-                Squawk.showGenericError()
+                Squawk.show(error: error)
             }
         }
     }
diff --git a/Classes/Milestones/MilestonesViewController.swift b/Classes/Milestones/MilestonesViewController.swift
index 6f463e3f1..f50ca26a4 100644
--- a/Classes/Milestones/MilestonesViewController.swift
+++ b/Classes/Milestones/MilestonesViewController.swift
@@ -64,8 +64,8 @@ MilestoneSectionControllerDelegate {
             switch result {
             case .success(let milestones):
                 self?.milestones = milestones
-            case .error:
-                Squawk.showGenericError()
+            case .error(let error):
+                Squawk.show(error: error)
             }
             self?.update(animated: true)
         }
diff --git a/Classes/New Issue/NewIssueTableViewController.swift b/Classes/New Issue/NewIssueTableViewController.swift
index 1c7820ee7..d6c4f5944 100644
--- a/Classes/New Issue/NewIssueTableViewController.swift	
+++ b/Classes/New Issue/NewIssueTableViewController.swift	
@@ -167,8 +167,8 @@ final class NewIssueTableViewController: UITableViewController, UITextFieldDeleg
                 strongSelf.dismiss(animated: trueUnlessReduceMotionEnabled, completion: {
                     delegate?.didDismissAfterCreatingIssue(model: model)
                 })
-            case .failure:
-                Squawk.showGenericError()
+            case .failure(let error):
+                Squawk.show(error: error)
             }
         }
     }
diff --git a/Classes/Notifications/NotificationSectionController.swift b/Classes/Notifications/NotificationSectionController.swift
index 620bd4900..04d389787 100644
--- a/Classes/Notifications/NotificationSectionController.swift
+++ b/Classes/Notifications/NotificationSectionController.swift
@@ -109,8 +109,8 @@ final class NotificationSectionController: ListSwiftSectionController<Notificati
                         repo: model.repo,
                         release: response.data.tagName
                     )
-                case .failure:
-                    Squawk.showGenericError()
+                case .failure(let error):
+                    Squawk.show(error: error)
                 }
         }
     }
diff --git a/Classes/Notifications/NotificationsViewController.swift b/Classes/Notifications/NotificationsViewController.swift
index c2934df15..aa8196454 100644
--- a/Classes/Notifications/NotificationsViewController.swift
+++ b/Classes/Notifications/NotificationsViewController.swift
@@ -102,9 +102,9 @@ BaseListViewController2EmptyDataSource
                 ids.append($0.id)
             }
             rebuildAndUpdate(ids: ids, append: append, page: next, animated: animated)
-        case .error:
+        case .error(let err):
             error(animated: trueUnlessReduceMotionEnabled)
-            Squawk.showNetworkError()
+            Squawk.show(error: err)
         }
 
         // set after updating so self.models has already been changed
diff --git a/Classes/People/PeopleViewController.swift b/Classes/People/PeopleViewController.swift
index f6b92f8b5..2e6d07a3c 100644
--- a/Classes/People/PeopleViewController.swift
+++ b/Classes/People/PeopleViewController.swift
@@ -135,8 +135,8 @@ PeopleSectionControllerDelegate {
                     nextPage = nil
                 }
                 self?.update(page: nextPage, animated: true)
-            case .failure:
-                Squawk.showGenericError()
+            case .failure(let error):
+                Squawk.show(error: error)
             }
         }
     }
diff --git a/Classes/PullRequestReviews/GithubClient+PullRequestReviewComments.swift b/Classes/PullRequestReviews/GithubClient+PullRequestReviewComments.swift
index 460d7af56..ccd714811 100644
--- a/Classes/PullRequestReviews/GithubClient+PullRequestReviewComments.swift
+++ b/Classes/PullRequestReviews/GithubClient+PullRequestReviewComments.swift
@@ -35,7 +35,7 @@ extension GithubClient {
         client.send(V3PullRequestCommentsRequest(owner: owner, repo: repo, number: number)) { result in
             switch result {
             case .failure(let error):
-                Squawk.showGenericError()
+                Squawk.show(error: error)
                 completion(.error(error))
             case .success(let response):
                 struct Thread {
@@ -144,7 +144,7 @@ extension GithubClient {
                     completion(.error(nil))
                 }
             case .failure(let error):
-                Squawk.showGenericError()
+                Squawk.show(error: error)
                 completion(.error(error))
             }
         }
diff --git a/Classes/PullRequestReviews/PullRequestReviewCommentsViewController.swift b/Classes/PullRequestReviews/PullRequestReviewCommentsViewController.swift
index 07d0e1d9c..df89cbb8e 100644
--- a/Classes/PullRequestReviews/PullRequestReviewCommentsViewController.swift
+++ b/Classes/PullRequestReviews/PullRequestReviewCommentsViewController.swift
@@ -128,7 +128,8 @@ final class PullRequestReviewCommentsViewController: MessageViewController,
         width: insetWidth
         ) { [weak self] (result) in
             switch result {
-            case .error: Squawk.showGenericError()
+            case .error(let error):
+                Squawk.show(error: error)
             case .success(let models):
                 self?.results = models
                 self?.feed.finishLoading(dismissRefresh: true, animated: true)
diff --git a/Classes/Repository/RepositoryBranches/RepositoryBranchesViewController.swift b/Classes/Repository/RepositoryBranches/RepositoryBranchesViewController.swift
index 8da2225ea..bb5ca9ca7 100644
--- a/Classes/Repository/RepositoryBranches/RepositoryBranchesViewController.swift
+++ b/Classes/Repository/RepositoryBranches/RepositoryBranchesViewController.swift
@@ -84,8 +84,8 @@ RepositoryBranchSectionControllerDelegate
                     branches: branches
                 )
                 
-            case .error:
-                Squawk.showError(message: "Couldn't fetch repository branches")
+            case .error(let error):
+                Squawk.show(error: error)
             }
             self?.update(animated: true)
         }
diff --git a/Classes/Repository/RepositoryClient.swift b/Classes/Repository/RepositoryClient.swift
index e8b6df9d7..27de42852 100644
--- a/Classes/Repository/RepositoryClient.swift
+++ b/Classes/Repository/RepositoryClient.swift
@@ -130,9 +130,9 @@ final class RepositoryClient {
         let contentSizeCategory = UIContentSizeCategory.preferred
         githubClient.client.query(query, result: { $0 }) { result in
             switch result {
-            case .failure:
-                Squawk.showGenericError()
-                completion(.error(nil))
+            case .failure(let error):
+                Squawk.show(error: error)
+                completion(.error(error))
             case .success(let data):
                 DispatchQueue.global().async {
                     // jump to a bg queue to parse models and presize text
diff --git a/Classes/Repository/RepositoryCodeBlobViewController.swift b/Classes/Repository/RepositoryCodeBlobViewController.swift
index 6f13d469c..e5249c857 100644
--- a/Classes/Repository/RepositoryCodeBlobViewController.swift
+++ b/Classes/Repository/RepositoryCodeBlobViewController.swift
@@ -147,9 +147,9 @@ final class RepositoryCodeBlobViewController: UIViewController, EmptyViewDelegat
                 self?.handle(text: text)
             case .nonUTF8:
                 self?.error(cannotLoad: true)
-            case .error:
+            case .error(let error):
                 self?.error(cannotLoad: false)
-                Squawk.showGenericError()
+                Squawk.show(error: error)
             }
         }
     }
diff --git a/Classes/Search/GithubClient+Search.swift b/Classes/Search/GithubClient+Search.swift
index 548ed0fec..440c056a4 100644
--- a/Classes/Search/GithubClient+Search.swift
+++ b/Classes/Search/GithubClient+Search.swift
@@ -30,7 +30,7 @@ extension GithubClient {
             case .failure(let error):
                 completion(.error(error))
                 if !isCancellationError(error) {
-                    Squawk.showGenericError()
+                    Squawk.show(error: error)
                 }
             case .success(let data):
                 DispatchQueue.global().async {
diff --git a/Classes/Systems/Autocomplete/IssueAutocomplete.swift b/Classes/Systems/Autocomplete/IssueAutocomplete.swift
index 784af15ff..42b4661af 100644
--- a/Classes/Systems/Autocomplete/IssueAutocomplete.swift
+++ b/Classes/Systems/Autocomplete/IssueAutocomplete.swift
@@ -59,8 +59,8 @@ final class IssueAutocomplete: AutocompleteType {
             result: { $0 }
         ) { [weak self] result in
             switch result {
-            case .failure:
-                Squawk.showGenericError()
+            case .failure(let error):
+                Squawk.show(error: error)
                 completion(false)
             case .success(let data):
                 guard let strongSelf = self else { return }
diff --git a/Classes/Systems/Squawk+GitHawk.swift b/Classes/Systems/Squawk+GitHawk.swift
index 24d0a4a8e..02cc4312b 100644
--- a/Classes/Systems/Squawk+GitHawk.swift
+++ b/Classes/Systems/Squawk+GitHawk.swift
@@ -42,6 +42,13 @@ extension Squawk {
         triggerHaptic()
     }
 
+    static func show(error: Error?, view: UIView? = window) {
+        let text = error?.localizedDescription
+            ?? NSLocalizedString("Something went wrong.", comment: "")
+        Squawk.shared.show(in: view, config: errorConfig(text: text))
+        triggerHaptic()
+    }
+
     static func showPermissionsError(view: UIView? = window) {
         Squawk.shared.show(in: view, config: errorConfig(text: NSLocalizedString("You must request access.", comment: "")))
         triggerHaptic()
diff --git a/Classes/Views/ShowErrorStatusBar.swift b/Classes/Views/ShowErrorStatusBar.swift
index 80e983b4c..9cc3b5f7b 100644
--- a/Classes/Views/ShowErrorStatusBar.swift
+++ b/Classes/Views/ShowErrorStatusBar.swift
@@ -12,7 +12,7 @@ import Squawk
 func ShowErrorStatusBar(graphQLErrors: [Error]?, networkError: Error?) {
     if networkError != nil {
         Squawk.showNetworkError()
-    } else if graphQLErrors != nil && graphQLErrors!.count > 0 {
-        Squawk.showGenericError()
+    } else if let graphQL = graphQLErrors?.first {
+        Squawk.show(error: graphQL)
     }
 }