Fix #2038 "NPE in Connection when implementing a save-draft button"