Improve error processing
Debug