Added further 404 template, conditional checking