Improved failure check (checks against safe not alive)

Signed-off-by: Wolfenswan <fridaynightsarekillingme+github@gmail.com>