Fixed NPE.
Merge branch 'master' into cling2