Tweak the callback controller for better error reporting