Finishing up TODO: Added Model class error handling