diff --git a/locale/en_US/locale.xml b/locale/en_US/locale.xml
index a537be0f9..49350cd36 100644
--- a/locale/en_US/locale.xml
+++ b/locale/en_US/locale.xml
@@ -549,6 +549,7 @@
 	<message key="schedConf.registration.alreadyRegistered">You are already registered for this conference, although payment has not yet been received. Please contact the principal contact in "About" if this is in error or you would like to change your registration.</message>
 	<message key="schedConf.registration.alreadyRegisteredAndPaid">You are already registered for this conference and your registration has been paid. Please contact the principal contact in "About" if this is in error or you would like to change your registration.</message>
 	<message key="schedConf.registration.noPaymentMethodAvailable">Your registration has been recorded. If applicable, you will be contacted regarding payment.</message>
+	<message key="schedConf.registration.paymentNotConfigured">There is no payment method configured for this conference. Please contact the Conference Manager.</message>
 	<message key="schedConf.registration.conferenceFees">Conference Fees</message>
 	<message key="schedConf.registration.failed">Your registration has failed.  Please try again.</message>
 	<message key="schedConf.registration.type">Registration Type</message>
diff --git a/pages/schedConf/SchedConfHandler.inc.php b/pages/schedConf/SchedConfHandler.inc.php
index c40b532c0..c14caa03c 100644
--- a/pages/schedConf/SchedConfHandler.inc.php
+++ b/pages/schedConf/SchedConfHandler.inc.php
@@ -154,10 +154,17 @@ function cfp() {
 	function registration() {
 		list($conference, $schedConf) = SchedConfHandler::validate(true, true);
 
+		$templateMgr =& TemplateManager::getManager();
 		$paymentManager =& OCSPaymentManager::getManager();
-		if (!$paymentManager->isConfigured()) Request::redirect(null, null, 'index');
+		if (!$paymentManager->isConfigured()) {
+			// If the system isn't fully configured, display a message and block
+			// the user from going further.
+			$templateMgr->assign('message', 'schedConf.registration.paymentNotConfigured');
+			$templateMgr->assign('backLinkLabel', 'common.back');
+			$templateMgr->assign('backLink', Request::url(null, null, 'index'));
+			return $templateMgr->display('common/message.tpl');
+		}
 
-		$templateMgr =& TemplateManager::getManager();
 		$templateMgr->assign('pageHierarchy', array(
 			array(Request::url(null, 'index', 'index'), $conference->getConferenceTitle(), true),
 			array(Request::url(null, null, 'index'), $schedConf->getSchedConfTitle(), true)));