Fix null in the bsquare commands