Fix for NPE in decorators and directory monitor registration for the watcherservice.