Small change on Toolbelt for Null checks