More improvements to debug output (show exceptions)
Fix smoke test