-- UCCPAR-482, added message as suggested by Richard