Added empty custom request data checks