VID-145 added some request validation per @owend