added changes from 5bbbcd9 - Safer, more defensive, template/view...