Slight tweak to fix NPE race