Hopefully fixed sync problem causing NPE