/tp command applied to player riding a pig will teleport them into a void

/tp command applied to player riding a pig will take the player off the pig and the /tp command dosn't work. Sometimes the map reloads and player falls into a void and becomes stuck without dying. Only way to get out is /kill. Please fix so that the player gets teleported to the correct coordinates and not be riding a pig. Thanks!