Added error handling,
Fix bug with multiple requests being issued