--- a/src/wifi/model/wifi-remote-station-manager.cc	Mon May 18 21:14:10 2015 -0700
+++ b/src/wifi/model/wifi-remote-station-manager.cc	Wed May 27 13:07:48 2015 +0200
@@ -1315,6 +1315,10 @@
 WifiRemoteStationManager::AddBasicMode (WifiMode mode)
 {
   NS_LOG_FUNCTION (this << mode);
+  if (mode.GetModulationClass () == WIFI_MOD_CLASS_HT)
+    {
+      NS_FATAL_ERROR ("It is not allowed to add a HT rate in the BSSBasicRateSet!");
+    }
   for (uint32_t i = 0; i < GetNBasicModes (); i++)
     {
       if (GetBasicMode (i) == mode)
@@ -1339,7 +1343,8 @@
 void 
 WifiRemoteStationManager::AddBasicMcs (uint8_t mcs)
 {
-   for (uint32_t i = 0; i < GetNBasicMcs (); i++)
+  NS_LOG_FUNCTION (this << (uint32_t)mcs);
+  for (uint32_t i = 0; i < GetNBasicMcs (); i++)
     {
       if (GetBasicMcs (i) == mcs)
         {