Include more information in exceptions