Add null checks
Bump version