Fix urls
Fix
Clean try/catch