Fixing a crash when trying to use none valid receiver
Merge branch 'dev'