PIM-1631: Fix error requirements