Avoid crash if controller isn't present (#89)

This should never happen, but apparently does due to some odd mod
interaction. Suspecting Optifine or similar client-side problem.
Merge remote-tracking branch 'origin/master' into dev