Fixes #1 where on a possible blockchain reorganisation, a null pointer
exception was thrown, which would then cause network synchronization to
fail.
Merge branch 'develop'