hotfix - return empty uris when timeout.
Merge branch 'hotfix/empty_notify'