Added some error reporting for remove.