Makes minor improvements on the exception handling on the model level