[#586] Adds error_summary to add stage 3 and tidies up errors after bootstrap upgrade