Merge "Revise controller error handling"