Move block hardness check to a slightly more appropriate place