Updated logging and error messages in model