Fix Thrown Exception: changes at service layer