Enhanced the logging a bit to better report service errors