[FIX] Process errors correctly