Prevent from crashes when url doesn't exists

Cherry picked from 3655b79..0d62434
Merge branch '0.1' into 0.2
Merge branch '0.2'