Check for errors during retrieval
CPU load issue fixed