Bug 1094847 - Add check for null filename