Fix misleading diagnostics on exception
Regression test
Merge pull request #1297 from sjinks/fcall-diag

Fix misleading diagnostics on exception