Added crash support, pending testing.