Fixed segfault post bail-out