Handling correctly null URLs in calls, related to #572
Fixed #537