Make code safe to run on machines without controllers *AGAIN*