Fixed a NPE introduced in #35. Block != int (blockId)