Refactor checking chapter nullity
Refactor and test handling of current and null chapters