Put an exception around the client deletion, should really make a proper fix