Adds a null check to label templates, adds return types for validation methods

Adds a null check to label templates, adds return types for validation methods #7812