Better error management and message display.