Improved handling of killed shell