Fix: not catching all possible errors on remove