(#2028) - Switch to catch over .then(null)