2014-01-14 prevent null pointer exception

2014-01-14 prevent null pointer exception again