JMX deregistration of MailServer can fail if the MBean doesn't exist

[6/26/09 1:36:06:664 CDT] 0000006a SystemOut     O 2009-06-26 01:36:06,660 ERROR [WebContainer : 0] [atlassian.confluence.event.ConfluenceEventManager] publishEvent An exception was encountered while processing the event: com.atlassian.confluence.event.events.admin.MailServerDeleteEvent[source=com.atlassian.confluence.admin.actions.mail.RemoveSmtpMailServerAction@46d646d6]
 -- referer: http://localhost:9080/confluence/admin/mail/viewmailservers.action | url: /confluence/admin/mail/removesmtpmailserver.action | userName: admin | action: removesmtpmailserver
java.lang.RuntimeException: javax.management.InstanceNotFoundException: Confluence:name=MailServer-SMTP Server
	at com.atlassian.confluence.jmx.MBeanExporterWithUnregisterImpl.unregisterBean(MBeanExporterWithUnregisterImpl.java:80)
	at com.atlassian.confluence.jmx.JmxUtil.unregisterBean(JmxUtil.java:49)
	at com.atlassian.confluence.event.listeners.MailServerEventListener.handleEvent(MailServerEventListener.java:36)
	at com.atlassian.event.DefaultEventManager$2.run(DefaultEventManager.java:202)
	at com.atlassian.event.DefaultEventManager$1.execute(DefaultEventManager.java:46)
	at com.atlassian.event.DefaultEventManager.handleEventListener(DefaultEventManager.java:198)
	at com.atlassian.event.DefaultEventManager.sendEventTo(DefaultEventManager.java:192)
	at com.atlassian.event.DefaultEventManager.onApplicationEvent(DefaultEventManager.java:79)
	at sun.reflect.GeneratedMethodAccessor78.invoke(Unknown Source)
	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
	at java.lang.reflect.Method.invoke(Method.java:615)
	at org.springframework.aop.support.AopUtils.invokeJoinpointUsingReflection(AopUtils.java:304)
	at org.springframework.aop.framework.ReflectiveMethodInvocation.invokeJoinpoint(ReflectiveMethodInvocation.java:182)
	at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:149)
	at org.springframework.transaction.interceptor.TransactionInterceptor.invoke(TransactionInterceptor.java:106)
	at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:171)
	at org.springframework.aop.framework.JdkDynamicAopProxy.invoke(JdkDynamicAopProxy.java:204)
	at $Proxy8.onApplicationEvent(Unknown Source)
	at org.springframework.context.event.SimpleApplicationEventMulticaster$1.run(SimpleApplicationEventMulticaster.java:77)
	at org.springframework.core.task.SyncTaskExecutor.execute(SyncTaskExecutor.java:49)
	at org.springframework.context.event.SimpleApplicationEventMulticaster.multicastEvent(SimpleApplicationEventMulticaster.java:75)
	at org.springframework.context.support.AbstractApplicationContext.publishEvent(AbstractApplicationContext.java:246)
	at com.atlassian.event.DefaultEventManager.publishEvent(DefaultEventManager.java:70)
	at com.atlassian.confluence.event.ConfluenceEventManager.publishEvent(ConfluenceEventManager.java:24)
	at sun.reflect.GeneratedMethodAccessor80.invoke(Unknown Source)
	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
	at java.lang.reflect.Method.invoke(Method.java:615)
	at org.springframework.aop.support.AopUtils.invokeJoinpointUsingReflection(AopUtils.java:304)
	at org.springframework.aop.framework.ReflectiveMethodInvocation.invokeJoinpoint(ReflectiveMethodInvocation.java:182)
	at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:149)
	at org.springframework.transaction.interceptor.TransactionInterceptor.invoke(TransactionInterceptor.java:106)
	at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:171)
	at org.springframework.aop.framework.JdkDynamicAopProxy.invoke(JdkDynamicAopProxy.java:204)
	at $Proxy8.publishEvent(Unknown Source)
	at com.atlassian.confluence.admin.actions.mail.RemoveSmtpMailServerAction.execute(RemoveSmtpMailServerAction.java:25)