Merge "APIH should not update db unless on error"