Fixes TC-1616 - (null) directory generated