In that sense it is just as broken as it was. 

Perhaps it is a good moment to change this part and put a volatile field in there we update using a cas; this will provide protection against NPE.