Do you think it would be a little cleaner to go ahead and refactor this into a match on blockInfo.get(blockId) into Some(info) and None? Converting and checking for null doesn't seem so idiomatic. Of course, that could easily be out of scope for this patch.