Fix for null collumns

Yep that was a big bug I missed. There are probably more. 

The fix is included, I also fixed a unit test that appears to have been bad and added another commit to put in a comment to deal with an issue that we shouldn't see. You can drop it if you agree that we would never have to deal with it.