OSCAR-0

Surrounding the class adding and removal with a try/catch statement.