#2457 use correct docker image and avoid NPE