Adding protection against AliFatal for SHUTTLE