diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEmpresaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEmpresaController.java
index 3c1a0fb1d..19c16f5b4 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEmpresaController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEmpresaController.java
@@ -252,8 +252,10 @@ public class EditarEmpresaController extends MyGenericForwardComposer {
 		lsCidades = new ArrayList<Ciudad>();
 		lsBanco = instFinanceiraService.obtenerTodos();
 		
-		empresaEmail = empresaEmailService.buscarPorEmpresa(empresa);
-		empresaEmailConfig = empresaEmailConfigService.buscarPorEmpresa(empresa);
+		if (empresa != null && empresa.getEmpresaId() != null) {
+			empresaEmail = empresaEmailService.buscarPorEmpresa(empresa);
+			empresaEmailConfig = empresaEmailConfigService.buscarPorEmpresa(empresa);
+		}
 		
 		super.doAfterCompose(comp);