Clean up, either use throw RuntimeException or Log.error, but not both. Using Log.error
Making core watcher compatible with Guava 12.0.1 (used in Codenvy)