Shouldnt show 'null' for non values on diagrm popups. Fix #35