added watermark file & improved error handling