Merge "Remove declaration of thrown exception"