Fix: Bad error management