FIX link and error handling for controllers