Ghetto error handling
Updates to base model