CLONE - Shortcode Pages in Wordpress misdirect on error

When in an event registration or a contribution page, in Wordpress, and using shortcodes with permalinks enabled:

If the contribution/event page is at www.hostname/shortcode?page=civicrm it redirects to an error page of www.hostname/index.php?page=civicrm.

The page needs to stay on the /shortcode URL structure, so as to stay within the right part of the website, and maintain the page templating of 'shortcode'.

The issue is discussed in more detail at: http://forum.civicrm.org/index.php/topic,23157.0.html