New URL
New URL
Added two null checks