Added try-except catches
Merge remote-tracking branch 'origin/testing' into testing
Merging
Merge remote-tracking branch 'origin/testing' into testing