Seems like this work could be deferred until we're sure we have a non-null error message