Template fix for NPE and release 1.9.2