Merge pull request #2929 from oguz3/master

Fix: added destroy null check