X-Git-Url: http://challenge-bot.com/repos/?a=blobdiff_plain;f=src%2Forg%2Fusfirst%2Ffrc%2Fteam3501%2Frobot%2FRobot.java;h=84fd2f9faa8afa3fc1726a564d18c5abcae4433e;hb=299be0310c4e309e9877df8eadbcc2073f943401;hp=c7ef783478c8307e5b01d3e5ae714dd192e9b887;hpb=f86bcb4376227b9c86981b23b13d821d7be37531;p=3501%2F3501-spark-go

diff --git a/src/org/usfirst/frc/team3501/robot/Robot.java b/src/org/usfirst/frc/team3501/robot/Robot.java
index c7ef783..84fd2f9 100644
--- a/src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java
@@ -29,8 +29,6 @@ public class Robot extends IterativeRobot {
     private Command autonomousCommand;
 
     public void robotInit() {
-		oi = new OI();
-
 		drivetrain = new Drivetrain();
 		arm        = new Arm();
 		claw       = new Claw();
@@ -39,6 +37,8 @@ public class Robot extends IterativeRobot {
 
 		autonData = new AutonData();
 
+		oi = new OI();
+
 		chooseAuto();
     }
 
@@ -62,7 +62,8 @@ public class Robot extends IterativeRobot {
     public void teleopInit() {
         schedule(new TurnOnCompressor());
 
-        autonomousCommand.cancel();
+        if (autonomousCommand != null)
+            autonomousCommand.cancel();
     }
 
     public void teleopPeriodic() {