Feature/better error handling

This is to temporarily handle other errors while we figure out how to detect them.