Add more error handling for parsing and no-content errors