Safety features are applied to an integrated insulin delivery system to enhance safety by controlling medication delivery including the automatic resumption of basal rate after a particular event, such as termination of a bolus, expiration of a time period, delayed resumption after the bolus has terminated, IOB comparison, and others. Other safety features include overriding a delivery control that may result in hypoglycemia, and terminating an extended bolus or temporary basal rate in view of a glucose signal indicating imminent carbohydrate deficiency. In another feature, an automatic resumption of a basal delivery rate is programmed into the delivery device to avoid the possibility of complete loss of delivery of insulin in the event that communication with the delivery device is disrupted.