Fix GLM NPE (had been broken for a few days now) - all tests pass.