Improve error on bad return

Working on issue #2006,

I believe I have everything working, it raises the correct exception but it also logs to INFO the erlang exception. Let me know what you think!