Bug fixes
Proper error handling in the hizzouse