Merge branch 'dev'

I think this one's in the correct direction, there's no convenient button to tell it to pull request in this direction.
0.4.3 ready for deployment
Rather than doing an additional null check here, the following two lines should be moved into the try block.