Allow for nil values in store