Fixing error message in test
Better error handling
Slightly better error handling for something that should never happen