Fixing strange NPE in demo.   How did that get there???