No longer fails with nil values