Protected against NPE in ListDialog
Minor tweaks in watching for null variables.