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 e9365323a..74e0cbd0e 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
@@ -1071,6 +1071,13 @@ public class EditarEmpresaController extends MyGenericForwardComposer {
 		empresaEmailEComerce.setAssunto(textAssuntoECommerce.getValue());
 		empresaEmailEComerce.setAnexo1(messageAnexo1Ecommerce.getValue() != null ? messageAnexo1Ecommerce.getValue() : "");
 		empresaEmailEComerce.setTextoEmail(messageConteudoEmailECommerce.getValue());
+		
+		Comboitem cbiTipoOperacao = cmbTipoOperacao.getSelectedItem();
+		if (cbiTipoOperacao != null) {
+			TipoOperacaoECommerce tipoOperacao = (TipoOperacaoECommerce) cbiTipoOperacao.getValue();
+			empresaEmailEComerce.setTipoOperacao(tipoOperacao.getId().toString());			
+		}
+		
 	}
 
 	private void preencheInformacoesEmpresaEmailFlexBus() {
@@ -2145,9 +2152,15 @@ public void onClick$btnTestEmailFlexBus(Event ev) throws InterruptedException {
 		if (cbiTipoOperacao != null) {
 			TipoOperacaoECommerce tipoOperacao = (TipoOperacaoECommerce) cbiTipoOperacao.getValue();
 			empresaEmailEComerce = empresaEmailEComerceService.buscarPorEmpresa(empresa, tipoOperacao.getId().toString());
-			textAssuntoECommerce.setValue(empresaEmailEComerce.getAssunto());
-			messageAnexo1Ecommerce.setValue(empresaEmailEComerce.getAnexo1());
-			messageConteudoEmailECommerce.setValue(empresaEmailEComerce.getTextoEmail());
+			if(empresaEmailEComerce != null) {
+				textAssuntoECommerce.setValue(empresaEmailEComerce.getAssunto());
+				messageAnexo1Ecommerce.setValue(empresaEmailEComerce.getAnexo1());
+				messageConteudoEmailECommerce.setValue(empresaEmailEComerce.getTextoEmail());
+			}else {
+				textAssuntoECommerce.setValue("");
+				messageAnexo1Ecommerce.setValue("");
+				messageConteudoEmailECommerce.setValue("");
+			}
 		}
 	}