Better error handling.
Even better handling.  Now avoids merging if fail to get new file from watermarking.