Issue 47 - Using proposed "NULL" filename over null