Only access request object when possible
Merge pull request #1 from bbasata/master

Only access the request object when possible