avoiding null pointer error

Change-Id: Ifb7444488a5fc617d8cc3a097ed36ff39c4d916b
fixing scatterplot editor bugs.

Change-Id: Iab50ada17b04c56013112261e13bebf8f71f3635