Fix NPE in Privacy Guard Manager
Revert "Fix NPE in Privacy Guard Manager"

This reverts commit e4834ae6c0dfe5050a5f8976043afab1597567a7.