GRECLIPSE-1765 Fix to prevent NPE
Merge pull request #76 from DenisMurashev/GRECLIPSE-1765

GRECLIPSE-1765 Fix to prevent NPE
Merge pull request #75 from DenisMurashev/GRECLIPSE-1129

GRECLIPSE-1129 Fix and tests