Fixing NullPointerException in magmacubes
Merge remote-tracking branch 'origin/razor'