Additional check against null in MagicSign#isMasked()
Change Location to BlockLocation in SignManager