SAK-25801 add extra check for null key value

git-svn-id: https://source.sakaiproject.org/svn/user/trunk@306991 66ffb92e-73f9-0310-93c1-f5514f145a0a