issue #919: fixed null options handling