YJ- Added NullPointerExceptions to Block.java