Error service bug fix