From 2eb3e82eeca106d28e83f1ad4770c467c4b54ca1 Mon Sep 17 00:00:00 2001
From: Pete Muir <pmuir@bleepbleep.org.uk>
Date: Fri, 5 Jun 2009 12:38:32 +0000
Subject: [PATCH] WBRI-253

git-svn-id: http://anonsvn.jboss.org/repos/weld/ri/trunk@2770 1c488680-804c-0410-94cd-c6b725194a0e
---
 .../webbeans/bean/proxy/EnterpriseBeanProxyMethodHandler.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/impl/src/main/java/org/jboss/webbeans/bean/proxy/EnterpriseBeanProxyMethodHandler.java b/impl/src/main/java/org/jboss/webbeans/bean/proxy/EnterpriseBeanProxyMethodHandler.java
index 94fa2a7735b..1c6584717fe 100644
--- a/impl/src/main/java/org/jboss/webbeans/bean/proxy/EnterpriseBeanProxyMethodHandler.java
+++ b/impl/src/main/java/org/jboss/webbeans/bean/proxy/EnterpriseBeanProxyMethodHandler.java
@@ -155,6 +155,10 @@ else if ("setDestroyed".equals(method.getName()))
          businessInterface = objectInterface;
       }
       Object proxiedInstance = reference.getBusinessObject(businessInterface);
+      if (proxiedInstance == null)
+      {
+         throw new IllegalStateException("No EJB can be found in the EJB container for " + reference + ". Make sure you are running an EJB container.");
+      }
       Method proxiedMethod = Reflections.lookupMethod(method, proxiedInstance);
       Object returnValue = Reflections.invokeAndWrap(proxiedMethod, proxiedInstance, args);
       log.trace("Executed " + method + " on " + proxiedInstance + " with parameters " + args + " and got return value " + returnValue);