This function was returning a non-nil error for the common, non-failure
case. The fix is to properly scope local error values and add early
returns.