SAK-25993 Code review feedback (added some null checks)

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