[Hotfix] Add check for wands and abort
Merge branch 'master' into develop