Pull #47 Delegated null value check to the header classes