Service - added error logging