Added better checking of retur value from service methods