Clarifying the logic of the return errors.
Increasing cpu usage for shock-server