base fixes
some simple error handling