NPE fix on block break