diff --git a/wpilibc/src/main/native/cpp/DriverStation.cpp b/wpilibc/src/main/native/cpp/DriverStation.cpp
index 7b379b3b58..96247041a7 100644
--- a/wpilibc/src/main/native/cpp/DriverStation.cpp
+++ b/wpilibc/src/main/native/cpp/DriverStation.cpp
@@ -160,7 +160,7 @@ bool DriverStation::GetStickButtonReleased(int stick, int button) {
     wpi_setWPIError(BadJoystickIndex);
     return false;
   }
-  if (button == 0) {
+  if (button <= 0) {
     ReportJoystickUnpluggedError(
         "ERROR: Button indexes begin at 1 in WPILib for C++ and Java");
     return false;
@@ -189,7 +189,7 @@ double DriverStation::GetStickAxis(int stick, int axis) {
     wpi_setWPIError(BadJoystickIndex);
     return 0.0;
   }
-  if (axis >= HAL_kMaxJoystickAxes) {
+  if (axis < 0 || axis >= HAL_kMaxJoystickAxes) {
     wpi_setWPIError(BadJoystickAxis);
     return 0.0;
   }
@@ -211,7 +211,7 @@ int DriverStation::GetStickPOV(int stick, int pov) {
     wpi_setWPIError(BadJoystickIndex);
     return -1;
   }
-  if (pov >= HAL_kMaxJoystickPOVs) {
+  if (pov < 0 || pov >= HAL_kMaxJoystickPOVs) {
     wpi_setWPIError(BadJoystickAxis);
     return -1;
   }
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/DriverStation.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/DriverStation.java
index 8dc44f15f1..d5f3dfb078 100644
--- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/DriverStation.java
+++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/DriverStation.java
@@ -420,7 +420,7 @@ public class DriverStation {
     if (stick < 0 || stick >= kJoystickPorts) {
       throw new IllegalArgumentException("Joystick index is out of range, should be 0-5");
     }
-    if (axis >= HAL.kMaxJoystickAxes) {
+    if (axis < 0 || axis >= HAL.kMaxJoystickAxes) {
       throw new IllegalArgumentException("Joystick axis is out of range");
     }
 
@@ -451,7 +451,7 @@ public class DriverStation {
     if (stick < 0 || stick >= kJoystickPorts) {
       throw new IllegalArgumentException("Joystick index is out of range, should be 0-5");
     }
-    if (pov >= HAL.kMaxJoystickPOVs) {
+    if (pov < 0 || pov >= HAL.kMaxJoystickPOVs) {
       throw new IllegalArgumentException("Joystick POV is out of range");
     }