Add service error tracking
Fix parent issue