Updates an error msg for media resource, performs a null check
Merge branch '7.1.2' of https://github.com/umbraco/Umbraco-CMS into 7.1.2
Fixes: U4-4696 Macro personalized cache with custom membership provider not working - for any membership provider regardless of provider user key type