Merge "exit instead of return if sideload file creation fails"