Added simple internal client exception handling