diff --git a/indra/newview/rlvactions.cpp b/indra/newview/rlvactions.cpp
index a626f89fe83b14352c822303cce2ccdfe2c2493a..995939c9df7ff39f3b3515b70782dd25fcc3c782 100644
--- a/indra/newview/rlvactions.cpp
+++ b/indra/newview/rlvactions.cpp
@@ -242,7 +242,7 @@ bool RlvActions::canShowName(EShowNamesContext eContext, const LLUUID& idAgent)
 			case SNC_TELEPORTREQUEST:
 				return gRlvHandler.isException(RLV_BHVR_SHOWNAMES, idAgent) || (gAgentID == idAgent);
 			default:
-				return true;
+				return false;
 		}
 	}
 	return false;
diff --git a/indra/newview/rlvhandler.cpp b/indra/newview/rlvhandler.cpp
index 1c6b6eff329cb1f1e6f3566ca990d59ebda71b6d..8bd2ec4c848f0a579df34910a1bfdc115819c7ca 100644
--- a/indra/newview/rlvhandler.cpp
+++ b/indra/newview/rlvhandler.cpp
@@ -475,6 +475,13 @@ ERlvCmdRet RlvHandler::processCommand(std::reference_wrapper<const RlvCommand> r
 		case RLV_TYPE_ADD:		// Checked: 2009-11-26 (RLVa-1.1.0f) | Modified: RLVa-1.1.0f
 			{
 				ERlvBehaviour eBhvr = rlvCmd.get().getBehaviourType();
+				if(eBhvr == RLV_BHVR_UNKNOWN)
+				{
+					eRet = RLV_RET_FAILED_PARAM;
+					RLV_DEBUGS << "\t- " << rlvCmd.get().getBehaviour() << " is UNKNOWN => Call Kitty!" << RLV_ENDL;
+					break;
+				}
+
 				if ( (m_Behaviours[eBhvr]) && ( (RLV_BHVR_SETCAM == eBhvr) || (RLV_BHVR_SETDEBUG == eBhvr) || (RLV_BHVR_SETENV == eBhvr) ) )
 				{
 					// Some restrictions can only be held by one single object to avoid deadlocks