Prevent NPE.

Do not convert to primitive type.
Merge branch 'master' of github.com:transmart/transmartApp