ERT-622 Added check to see if list is None