Error management improvements