Optimize management of nil id
Add extra test validation
Merge pull request #117 from Shopify/optimize-management-of-nil-id

Optimize management of nil id