Added a check for 'url' if its NULL