Added exception catch and options for remote service