A few more checks and balances added to Request