Fix empty option type exception

Option value id is nil exception if new option type created
Merge pull request #475 from artemaminov/2-0-stable

Fix empty option type exception