Added crash protector