Fixed null point exception in address object. Other fixes as well