SAK-25778 avoid NPE for siteId by checking on the siteId value first

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