added crash / kill handling