- fixed NULL reference exception