Fetch the controller in a safe manner

closes #1
Merge pull request #2 from dkobia/patch-1

Fetch the controller in a safe manner