Cover some trivial stuff in FileUploads, and fix the way the exception hierarchy works.