Better handling of exception in Link