Error catching & fixes to get/add