[Issue #86] Adding additional checks to prevent multiple requests with invalid credentials