Fix crash in watch due to null pointer exception.

- http://adsk-oss.myjetbrains.com/youtrack/issue/MAGN-2264