MDE-3 Add npe checks. Switch back to benetech template