Changed a bit courts retrieval error handling