diff --git a/Frameworks/Account/Feedbin/FeedbinAPICaller.swift b/Frameworks/Account/Feedbin/FeedbinAPICaller.swift
index 7e3cc7eed..25322e3d2 100644
--- a/Frameworks/Account/Feedbin/FeedbinAPICaller.swift
+++ b/Frameworks/Account/Feedbin/FeedbinAPICaller.swift
@@ -28,8 +28,17 @@ final class FeedbinAPICaller: NSObject {
 			switch result {
 			case .success:
 				handler(.success(true))
-			case .failure:
-				handler(.success(false))
+			case .failure(let error):
+				switch error {
+				case TransportError.httpError(let status):
+					if status == 401 {
+						handler(.success(false))
+					} else {
+						handler(.failure(error))
+					}
+				default:
+					handler(.failure(error))
+				}
 			}
 		}
 		
diff --git a/Mac/Preferences/Accounts/AccountsAddFeedbinWindowController.swift b/Mac/Preferences/Accounts/AccountsAddFeedbinWindowController.swift
index 3de63f21d..f06d8da54 100644
--- a/Mac/Preferences/Accounts/AccountsAddFeedbinWindowController.swift
+++ b/Mac/Preferences/Accounts/AccountsAddFeedbinWindowController.swift
@@ -69,12 +69,12 @@ class AccountsAddFeedbinWindowController: NSWindowController, NSTextFieldDelegat
 					
 					self.hostWindow?.endSheet(self.window!, returnCode: NSApplication.ModalResponse.OK)
 				} else {
-					self.errorMessageLabel.stringValue = NSLocalizedString("Unable to verify credentials.", comment: "Credentials Error")
+					self.errorMessageLabel.stringValue = NSLocalizedString("Invalid email/password combination.", comment: "Credentials Error")
 				}
 
 			case .failure:
 				
-				self.errorMessageLabel.stringValue = NSLocalizedString("Unable to verify credentials due to networking error.", comment: "Credentials Error")
+				self.errorMessageLabel.stringValue = NSLocalizedString("Network error.  Try again later.", comment: "Credentials Error")
 				
 			}