Hotfix: check also the owner value.
Hotfix - Fixed undefined variable notice.
Merge branch 'hotfix' into develop