Create new event from template is broken

(Both in trunk and accounts.trunk branches)

Steps to recreate:

• New Event
• From Template - select Paid Conference with Online Registration template
• Fill in required fields and click Continue

Fatal error: Call to a member function save() on a non-object in /Users/dgg/svn/crm_v4.1/CRM/Price/BAO/Set.php on line 931

Looks to me like the problem is in lines 883-4 on CRM/Event/BAO/Event.php
$priceSetId = CRM_Price_BAO_Set::getFor('civicrm_event', $id);
$copyPriceSet = &CRM_Price_BAO_Set::copy($priceSetId);

$priceSetId appears to be empty in this flow, and so the call to copy fails.

Call Stack

1. Time Memory Function Location
   1 0.0003 676040 {main}

   ( ) ../index.php:0
   2 0.1047 27860408 menu_execute_active_handler( ) ../index.php:21
   3 0.1047 27861608 call_user_func_array ( ) ../menu.inc:516
   4 0.1047 27862224 civicrm_invoke( ) ../menu.inc:516
   5 0.1641 40680712 CRM_Core_Invoke::invoke( ) ../civicrm.module:461
   6 0.1846 41935368 CRM_Core_Invoke::runItem( ) ../Invoke.php:60
   7 0.1900 42849512 CRM_Utils_Wrapper->run( ) ../Invoke.php:250
   8 0.2080 46523464 CRM_Core_Controller->run( ) ../Wrapper.php:115
   9 0.2082 46530832 HTML_QuickForm_Page->handle( ) ../Controller.php:288
   10 0.2082 46530912 HTML_QuickForm_Controller->handle( ) ../Page.php:103
   11 0.2082 46530912 CRM_Core_QuickForm_Action_Upload->perform( ) ../Controller.php:203
   12 0.2495 51650384 CRM_Core_QuickForm_Action_Upload->realPerform( ) ../Upload.php:128
   13 0.2680 51672144 CRM_Core_Form->mainProcess( ) ../Upload.php:151
   14 0.2680 51672144 CRM_Event_Form_ManageEvent_EventInfo->postProcess( ) ../Form.php:246
   15 0.3722 58475304 CRM_Event_BAO_Event::copy( ) ../EventInfo.php:336
   16 0.3774 59092040 CRM_Price_BAO_Set::copy( ) ../Event.php:884