Fixed NPE where additional options initialization was not checking for null.
Code changed so evns.expand is only called once.
Code changed so evns.expand is only called once.
Merge pull request #6 from jenkinsci/NPEFix

NullPointerException fix