Fix for issue #592: Update address if undefined