Fix issue with empty filename string