Addresses #464 (Teapot protection)