Only pop source_address from kwargs after saving it