Payment now changes null charity_id to =1, and logs a warning message when that happens, since it shouldn't happen.