Fix null card handling.

If null cards are returned from CardBuilder, do not add them to the
list.

Change-Id: Ic73b1e01d45e30dd20d7343f059d5a01a4dafde8