Fix potential NPE
Experiment with tests for Blockwise mode... doesn't really work