automerge: ce3153d * commit 'ce3153df56e4ed984b949869dd0ec97793f2c428': Fix NPE if FPE service does not exist.