Bug 15477: (follow-up) Bug 14100: Better errors handling