Add some null-safety when converting from api to sdk objects.
Merge branch 'dev' of https://github.com/silanis/esl.sdk.java into dev