add guard on return_message
Merge pull request #323 from ingoclaro/fix-return_message

add guard on return_message