Update to provide more details in the exception