diff --git a/src/main/java/baritone/command/defaults/FarmCommand.java b/src/main/java/baritone/command/defaults/FarmCommand.java
index cae884b7..1903f89f 100644
--- a/src/main/java/baritone/command/defaults/FarmCommand.java
+++ b/src/main/java/baritone/command/defaults/FarmCommand.java
@@ -61,13 +61,9 @@ public class FarmCommand extends Command {
                     waypoint = waypoints[0];
                     break;
                 default:
-                    break;
-            }
-            if (waypoint == null) {
-                throw new CommandInvalidStateException("Multiple waypoints were found");
-            } else {
-                origin = waypoint.getLocation();
+                    throw new CommandInvalidStateException("Multiple waypoints were found");
             }
+            origin = waypoint.getLocation();
         }
 
         baritone.getFarmProcess().farm(range, origin);