Merge "(bug 24521) Move hard coded "code error!" to messages"