Fixes the “can’t get __ of undefined” error if no options are defined
Merge branch 'optsfix' into throttles

* optsfix:
  Fixes the “can’t get __ of undefined” error if no options are defined