Add some extra empty checks and add helper for checking vars

This should help to address issues with group wikis being unable to commit resources.

Merge request reports