Adding some checking on handled requests.