timeout protection on create as well