Only return a filename when there is a filename. This fixes CD-117.