diff --git a/Sources/AmiiboService/Public/Clients/AmiiboLiveClient.swift b/Sources/AmiiboService/Public/Clients/AmiiboLiveClient.swift
index c8f9268..d954dc0 100644
--- a/Sources/AmiiboService/Public/Clients/AmiiboLiveClient.swift
+++ b/Sources/AmiiboService/Public/Clients/AmiiboLiveClient.swift
@@ -202,6 +202,10 @@ private extension AmiiboLiveClient {
             }
         case .badRequest:
             throw AmiiboServiceError.badRequest
+        case .notFound:
+            throw AmiiboServiceError.notFound
+        case .internalServerError:
+            throw AmiiboServiceError.notAvailable
         case let .undocumented(statusCode, _):
             throw AmiiboServiceError.undocumented(statusCode)
         }
@@ -365,6 +369,12 @@ private extension AmiiboLiveClient {
             case let .json(output):
                 return output.lastUpdated
             }
+        case .badRequest:
+            throw AmiiboServiceError.badRequest
+        case .notFound:
+            throw AmiiboServiceError.notFound
+        case .internalServerError:
+            throw AmiiboServiceError.notAvailable
         case let .undocumented(statusCode, _):
             throw AmiiboServiceError.undocumented(statusCode)
         }