Fixes a possible NULL pointer dereference. SVN-Revision: 18925
SVN-Revision: 18320
SVN-Revision: 18283