Catch error if remoteControl is somehow null
Merge remote-tracking branch 'origin/master'