Allow images to pass through without any processing options

and improve error handling.
Merge branch 'stage'