Review 21507

C. Thomas Tyler
Merged Sven's change from @21316: Enhanced error output to print the actual exception.
Tip: Use n and p to cycle through the changes.