Issue #127: Crash failsafe