Stop bug

The NullPointerException bug when you close eclipse. It is the one reported by Jongwook Kim.