Handle missing attachment files a bit better