Added error checking & error template