Renamed fallback handler to failsafe handler