diff --git a/wpilibc/wpilibC++/src/RobotState.cpp b/wpilibc/wpilibC++/src/RobotState.cpp
index 33e22a1545..747000aaab 100644
--- a/wpilibc/wpilibC++/src/RobotState.cpp
+++ b/wpilibc/wpilibC++/src/RobotState.cpp
@@ -7,35 +7,35 @@ void RobotState::SetImplementation(RobotStateInterface* i) {
 }
 
 bool RobotState::IsDisabled() {
-    if (impl != 0) {
+    if (impl != nullptr) {
         return impl->IsDisabled();
     }
     return true;
 }
 
 bool RobotState::IsEnabled() {
-    if (impl != 0) {
+    if (impl != nullptr) {
         return impl->IsEnabled();
     }
     return false;
 }
 
 bool RobotState::IsOperatorControl() {
-    if (impl != 0) {
+    if (impl != nullptr) {
         return impl->IsOperatorControl();
     }
     return true;
 }
 
 bool RobotState::IsAutonomous() {
-    if (impl != 0) {
+    if (impl != nullptr) {
         return impl->IsAutonomous();
     }
     return false;
 }
 
 bool RobotState::IsTest() {
-    if (impl != 0) {
+    if (impl != nullptr) {
         return impl->IsTest();
     }
     return false;