check for null before invoking file system context callbacks
Merge branch 'master' of github.com:rstudio/rstudio