Handle optional values better
Change-Id: Iabbd95c67f459f26a34bd8fbc772acd609c268da
Reviewed-on: http://review.couchbase.org/38482
Reviewed-by: Chris Hillery <ceej@couchbase.com>
Tested-by: Chris Hillery <ceej@couchbase.com>