Added better error reporting.
3.5.52