null check process to avoid NPE
Merge branch 'hotfix/v0.2.5'
Merge tag 'v0.2.5' into develop

v0.2.5