Change failsafe message to be more generic
Merge pull request #981 from DroidPlanner/failsafe

Change failsafe message to be more generic