Bug 14100: Better errors handling