More meaningful error messages on upload and return button