Better error handling in weird edge cases
REFACTOR: Split controller fetcher into its own function