Added some spacing
Added a fix for tracking failed template expansion