Merge pull request #141 from unwin/develop

Develop
FB 4924 - NPE issue. Hoping to fix, or provide better diagnostics.