Make it work with await
Fix crash if empty Uri
Make it work with await