Fix NPE
Still gaps between chunks (argh!) but otherwise, it should be hooked up
to the preparator on my side.