Container: fixed NPE, still not working