Adding null checks for lists of artifacts before mapping them...now methods will simply return empty Map instances if null lists are passed in.