More prevention against merging empty and/or non-existent files. Should be fool-proof now.