App controller does not exist if we're doing unit testing

This fixes issues so our unit tests don't have problems
Merge branch 'handles-issue-if-controller-is-not-loaded'