Fixed error handling.  That indent...