Proxy issue

Fixing issue where there were NullPointerExceptions when proxy data were not set.