Fix Map throwing null pointers on disabledBlocks