Added key-check for handlers being requested