Added error handling on remove overflow