Add in check for ObjectNotFound and clean up the webapp