fix for lack of input validation - RT#15405