Revert "Correctly catch template errors without returning invalid data"

This reverts commit 3cd7d47b7ec2a8a560c6da803768eb3d9983c252.