Added NPE protection to the Expression Editing support