Check for null as well and bump version