Fix java.lang.IllegalArgumentException for UploadPlugin
Merge : Fix java.lang.IllegalArgumentException for UploadPlugin