LBSD-140 Fixed crash
Merge pull request #867 from vladnicoara/master

LBSD-140 Fixed crash