Added check for delivery address (FIX: move to Geo)