diff --git a/src/main/java/me/braydon/mc/service/MojangService.java b/src/main/java/me/braydon/mc/service/MojangService.java
index a05930e..bb4255e 100644
--- a/src/main/java/me/braydon/mc/service/MojangService.java
+++ b/src/main/java/me/braydon/mc/service/MojangService.java
@@ -138,12 +138,13 @@ public final class MojangService {
      * @param platformName the name of the platform
      * @param hostname the hostname of the server
      * @return the resolved Minecraft server
+     * @throws BadRequestException if the hostname is unknown
      * @throws InvalidMinecraftServerPlatform if the platform is invalid
      * @throws ResourceNotFoundException if the server isn't found
      */
     @NonNull
     public MinecraftServer getMinecraftServer(@NonNull String platformName, @NonNull String hostname)
-            throws InvalidMinecraftServerPlatform, ResourceNotFoundException {
+            throws BadRequestException, InvalidMinecraftServerPlatform, ResourceNotFoundException {
         MinecraftServer.Platform platform = EnumUtils.getEnumConstant(MinecraftServer.Platform.class, platformName.toUpperCase());
         if (platform == null) { // Invalid platform
             throw new InvalidMinecraftServerPlatform();
diff --git a/src/main/java/me/braydon/mc/service/pinger/impl/JavaMinecraftServerPinger.java b/src/main/java/me/braydon/mc/service/pinger/impl/JavaMinecraftServerPinger.java
index 85cdd4c..f78670e 100644
--- a/src/main/java/me/braydon/mc/service/pinger/impl/JavaMinecraftServerPinger.java
+++ b/src/main/java/me/braydon/mc/service/pinger/impl/JavaMinecraftServerPinger.java
@@ -68,7 +68,7 @@ public final class JavaMinecraftServerPinger implements MinecraftServerPinger<Ja
         } catch (IOException ex) {
             if (ex instanceof UnknownHostException) {
                 throw new BadRequestException("Unknown hostname: %s".formatted(hostname));
-            } else if (ex instanceof ConnectException) {
+            } else if (ex instanceof ConnectException || ex instanceof SocketTimeoutException) {
                 throw new ResourceNotFoundException(ex);
             }
             log.error("An error occurred pinging %s:%s:".formatted(hostname, port), ex);