Minor update just to fix a nullpointer issue, but nothing much else.