Handle null pointer exception when getting a dictionary value
Merge pull request #379 from pfschwartz/oe4.1.1

Handle null pointer exception when getting a dictionary value
Merge pull request #427 from jfurlong/master

oe4.1.1 merge into Master
Merge tag 'oe4.1.1' into develop
Merge pull request #429 from jfurlong/develop

Merge oe4.1.1