Improves error reporting#1699

xfbs wants to merge 2 commits intoosohq:mainosohq/oso:mainfrom

xfbs-fork:errorsxfbs-fork/oso:errorsCopy head branch name to clipboard