Fix null reference exception if missing opts
Merge pull request #920 from smithkl42/2.0.8

Fix null reference exception if missing opts