Issue #601 fix, check for null url

Fix for Issue #601