v0.2.3 - account for null