Add signal handling on fallbacks