Avoid possible NPEs
Content page editing
Configs admin
Updating static references