bug fix

try to prevent NPE
namespace

add namespace to editor
Merge branch 'bug-fix'