Added additional null check for this.options
Added additional null check for this.options
Merge pull request #8 from sfkaos/master

Additional null check for this.options