Uncommented error handling