Validate request better