fixed NPE that occurs when Eclipse is not running
improved Javadoc