use Exception instead of BaseException or nothing

This is just like my PR for the client.