First GIT attempt. Contains mods for ticket-1556
removed unnecessary null check
Merge pull request #2 from hananherzog/ticket-1556

First GIT attempt. Contains mods for ticket-1556