some fixes from a very unusual corner-case seen

git-svn-id: https://plugins.svn.wordpress.org/updraftplus/trunk@816617 b8457f37-d9ea-0310-8a92-e5e31aec5664