Fix NPE on stop-container container