better output
use exception to prevent uploading of broken stuff
better exception logging