Add some more request validation