Do we need better exception handling here?