Commit cf1e4627e4ff418b58766badf22e79cabda908c4

Con Kolivas 2011-07-06T13:04:35

Give error messages at all points of failure.