include ServiceError in modules

Change-Id: I58fa8dbda2018779d2ab5ac348a350c28cd6ac4e