BZ1073818 - NPE in server log when creating new rule (#2). Cherry-picked from 33fae04