[RFR] Fix null matrix

Fixes #6