PIM-2221 Made error message more accurate