Fixes returned errors