Cleanup...
Better error reporting...