# This is a combination of 2 commits.
# The first commit's message is:

Added a new function to handle absence of affiliations.
Added NPE checks to ensure functionality.

fixes rSmart/issues#221
fixes rSmart/issues#243

# The 2nd commit message will be skipped:

#	Added a new function to handle absence of affiliations.
#	Added NPE checks to ensure functionality.
#
#	fixes rSmart/issues#221
#	fixes rSmart/issues#243