Updated several fields and added more detail to exception handling