Null value exception from widget fixes #33