Better checks on removing constraints

- Removing constraints that don't exist generates the proper return code and error