removed notnull checks in address