Add NullPointerException check in cleanUp-method