Made SafeReturn a class