End gateway portals dumping you over the Void

One annoying thing about the End gateway portals is that they don't check to make sure there's a solid block somewhere below you when placing you on your return to the main island. Elytra help to mitigate this somewhat, but like other people have posted, they don't always work, and I have incurred some heavy losses thanks to this(full set of enchanted diamond armor + anchanted diamond pickaxe among other things). Can you please fix the end gateways so they either generate further inland or generate an obsidian platform under you on your return to the main island?