Add extra logging and only try to kill container if an exception is thrown