Modified return in case of failure