[#62628522] small fixes: correct error message and restore of marking in special case