Fixes #84 Check for Nulls in Entity Templates