Improve errors handling and overlay messages.