Checking existance of DOM element before using it
Note about 1.24.7
Merge branch 'hotfix/1.24.7'