DBC 612 - Check if url not empty.
Merge branch 'DBC-612' into develop