Merge "Remove undefined variable in exception message"