Added empty map handling
Merge branch 'hotfix/1.24.2'