GitLab

During a failure, return a null value instead of an empty list.

Change-Id: I34763c90eb65b0ed6bbe2757310992541feeb1a8