Add checks in some places to see if a response doesn't exist
Merge pull request #62 from gruiz17/master

Add checks in some places to see if a response doesn't exist