Avoid nullpointer if remote responds in an unexpected way
Merge branch 'master' of https://github.com/digipost/sdp-shared