nit: I think this `.catchError` should be on the preceding line