Merge branch 'image-resize-helper/error-handling'