#40 , avoid Null Exception