fix possible null ptr deref
fix possible null ptr deref



SVN revision: 50422

tasn/elementary,rvandegrift/elementary,rvandegrift/elementary,FlorentRevest/Elementary,FlorentRevest/Elementary,tasn/elementary,rvandegrift/elementary,FlorentRevest/Elementary,tasn/elementary,FlorentRevest/Elementary,rvandegrift/elementary,tasn/elementary,tasn/elementary