diff --git a/src/modules/rtp_rtcp/interface/rtp_rtcp.h b/src/modules/rtp_rtcp/interface/rtp_rtcp.h
index 08a92b3175..0a26da3d8f 100644
--- a/src/modules/rtp_rtcp/interface/rtp_rtcp.h
+++ b/src/modules/rtp_rtcp/interface/rtp_rtcp.h
@@ -1010,9 +1010,9 @@ public:
     *
     *   return -1 on failure else 0
     */
-    virtual WebRtc_Word32 SetSendBitrate(const WebRtc_UWord32 startBitrate,
-                                       const WebRtc_UWord16 minBitrateKbit,
-                                       const WebRtc_UWord16 maxBitrateKbit) = 0;
+    virtual void SetSendBitrate(const WebRtc_UWord32 startBitrate,
+                                const WebRtc_UWord16 minBitrateKbit,
+                                const WebRtc_UWord16 maxBitrateKbit) = 0;
 
     /*
     *   Turn on/off generic FEC
diff --git a/src/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h b/src/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h
index 7f6ad86697..d11328be3b 100644
--- a/src/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h
+++ b/src/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h
@@ -243,7 +243,7 @@ class MockRtpRtcp : public RtpRtcp {
   MOCK_METHOD1(SetCameraDelay,
       WebRtc_Word32(const WebRtc_Word32 delayMS));
   MOCK_METHOD3(SetSendBitrate,
-      WebRtc_Word32(const WebRtc_UWord32 startBitrate, const WebRtc_UWord16 minBitrateKbit, const WebRtc_UWord16 maxBitrateKbit));
+      void(const WebRtc_UWord32 startBitrate, const WebRtc_UWord16 minBitrateKbit, const WebRtc_UWord16 maxBitrateKbit));
   MOCK_METHOD3(SetGenericFECStatus,
       WebRtc_Word32(const bool enable, const WebRtc_UWord8 payloadTypeRED, const WebRtc_UWord8 payloadTypeFEC));
   MOCK_METHOD3(GenericFECStatus,
diff --git a/src/modules/rtp_rtcp/source/bandwidth_management.cc b/src/modules/rtp_rtcp/source/bandwidth_management.cc
index 9d5cf68b39..8851fdba3e 100644
--- a/src/modules/rtp_rtcp/source/bandwidth_management.cc
+++ b/src/modules/rtp_rtcp/source/bandwidth_management.cc
@@ -42,7 +42,7 @@ BandwidthManagement::~BandwidthManagement()
     delete _critsect;
 }
 
-WebRtc_Word32
+void
 BandwidthManagement::SetSendBitrate(const WebRtc_UWord32 startBitrate,
                                     const WebRtc_UWord16 minBitrateKbit,
                                     const WebRtc_UWord16 maxBitrateKbit)
@@ -59,7 +59,6 @@ BandwidthManagement::SetSendBitrate(const WebRtc_UWord32 startBitrate,
     {
         _maxBitRateConfigured = maxBitrateKbit*1000;
     }
-    return 0;
 }
 
 WebRtc_Word32
diff --git a/src/modules/rtp_rtcp/source/bandwidth_management.h b/src/modules/rtp_rtcp/source/bandwidth_management.h
index 6761820fc4..10f821bd92 100644
--- a/src/modules/rtp_rtcp/source/bandwidth_management.h
+++ b/src/modules/rtp_rtcp/source/bandwidth_management.h
@@ -43,9 +43,9 @@ public:
 
     WebRtc_Word32 AvailableBandwidth(WebRtc_UWord16* bandwidthKbit) const;
 
-    WebRtc_Word32 SetSendBitrate(const WebRtc_UWord32 startBitrate,
-                                 const WebRtc_UWord16 minBitrateKbit,
-                                 const WebRtc_UWord16 maxBitrateKbit);
+    void SetSendBitrate(const WebRtc_UWord32 startBitrate,
+                        const WebRtc_UWord16 minBitrateKbit,
+                        const WebRtc_UWord16 maxBitrateKbit);
 
     WebRtc_Word32 MaxConfiguredBitrate(WebRtc_UWord16* maxBitrateKbit);
 
diff --git a/src/modules/rtp_rtcp/source/rtp_rtcp_impl.cc b/src/modules/rtp_rtcp/source/rtp_rtcp_impl.cc
index 98495b5858..f10d675a05 100644
--- a/src/modules/rtp_rtcp/source/rtp_rtcp_impl.cc
+++ b/src/modules/rtp_rtcp/source/rtp_rtcp_impl.cc
@@ -2192,10 +2192,9 @@ RtpVideoCodecTypes ModuleRtpRtcpImpl::SendVideoCodec() const {
     return _rtpSender.VideoCodecType();
 }
 
-WebRtc_Word32 ModuleRtpRtcpImpl::SetSendBitrate(
-    const WebRtc_UWord32 startBitrate,
-    const WebRtc_UWord16 minBitrateKbit,
-    const WebRtc_UWord16 maxBitrateKbit) {
+void ModuleRtpRtcpImpl::SetSendBitrate(const WebRtc_UWord32 startBitrate,
+                                       const WebRtc_UWord16 minBitrateKbit,
+                                       const WebRtc_UWord16 maxBitrateKbit) {
 
     WEBRTC_TRACE(kTraceModuleCall,
                  kTraceRtpRtcp,
@@ -2220,11 +2219,12 @@ WebRtc_Word32 ModuleRtpRtcpImpl::SetSendBitrate(
             it++;
         }
     }
+    // TODO(henrike): this function also returns a value. It never fails so
+    // make it return void.
     _rtpSender.SetTargetSendBitrate(startBitrate);
 
-    return _bandwidthManagement.SetSendBitrate(startBitrate,
-                                               minBitrateKbit,
-                                               maxBitrateKbit);
+    _bandwidthManagement.SetSendBitrate(startBitrate, minBitrateKbit,
+                                        maxBitrateKbit);
 }
 
 WebRtc_Word32 ModuleRtpRtcpImpl::SetKeyFrameRequestMethod(
diff --git a/src/modules/rtp_rtcp/source/rtp_rtcp_impl.h b/src/modules/rtp_rtcp/source/rtp_rtcp_impl.h
index b39e9fd410..2d9d625fbf 100644
--- a/src/modules/rtp_rtcp/source/rtp_rtcp_impl.h
+++ b/src/modules/rtp_rtcp/source/rtp_rtcp_impl.h
@@ -460,9 +460,9 @@ public:
 
     virtual WebRtc_Word32 SetCameraDelay(const WebRtc_Word32 delayMS);
 
-    virtual WebRtc_Word32 SetSendBitrate(const WebRtc_UWord32 startBitrate,
-                                       const WebRtc_UWord16 minBitrateKbit,
-                                       const WebRtc_UWord16 maxBitrateKbit);
+    virtual void SetSendBitrate(const WebRtc_UWord32 startBitrate,
+                                const WebRtc_UWord16 minBitrateKbit,
+                                const WebRtc_UWord16 maxBitrateKbit);
 
     virtual WebRtc_Word32 SetGenericFECStatus(const bool enable,
                                             const WebRtc_UWord8 payloadTypeRED,
diff --git a/src/video_engine/vie_channel.cc b/src/video_engine/vie_channel.cc
index fca51da03f..5e02d3e255 100644
--- a/src/video_engine/vie_channel.cc
+++ b/src/video_engine/vie_channel.cc
@@ -251,13 +251,8 @@ WebRtc_Word32 ViEChannel::SetSendCodec(const VideoCodec& video_codec,
         std::min(start_bitrate, video_codec.simulcastStream[0].maxBitrate);
     start_bitrate -= stream_bitrate;
     // Set correct bitrate to base layer.
-    if (rtp_rtcp_.SetSendBitrate(
-          stream_bitrate, video_codec.minBitrate,
-          video_codec.simulcastStream[0].maxBitrate) != 0) {
-      WEBRTC_TRACE(kTraceError, kTraceVideo, ViEId(engine_id_, channel_id_),
-                   "%s: could not set send bitrates", __FUNCTION__);
-      return -1;
-    }
+    rtp_rtcp_.SetSendBitrate(stream_bitrate, video_codec.minBitrate,
+                             video_codec.simulcastStream[0].maxBitrate);
     // Create our simulcast RTP modules.
     for (int i = simulcast_rtp_rtcp_.size();
          i < video_codec.numberOfSimulcastStreams - 1;
@@ -333,13 +328,8 @@ WebRtc_Word32 ViEChannel::SetSendCodec(const VideoCodec& video_codec,
       const WebRtc_UWord32 stream_bitrate =
           std::min(start_bitrate, video_codec.simulcastStream[idx].maxBitrate);
       start_bitrate -= stream_bitrate;
-      if (rtp_rtcp->SetSendBitrate(
-            stream_bitrate, video_codec.minBitrate,
-            video_codec.simulcastStream[idx].maxBitrate) != 0) {
-        WEBRTC_TRACE(kTraceError, kTraceVideo, ViEId(engine_id_, channel_id_),
-                     "%s: could not set send bitrates", __FUNCTION__);
-        return -1;
-      }
+      rtp_rtcp->SetSendBitrate(stream_bitrate, video_codec.minBitrate,
+                               video_codec.simulcastStream[idx].maxBitrate);
     }
     vie_receiver_.RegisterSimulcastRtpRtcpModules(simulcast_rtp_rtcp_);
   } else {
@@ -357,13 +347,9 @@ WebRtc_Word32 ViEChannel::SetSendCodec(const VideoCodec& video_codec,
     // Clear any previous modules.
     vie_receiver_.RegisterSimulcastRtpRtcpModules(simulcast_rtp_rtcp_);
 
-    if (rtp_rtcp_.SetSendBitrate(video_codec.startBitrate * 1000,
-                                 video_codec.minBitrate,
-                                 video_codec.maxBitrate) != 0) {
-      WEBRTC_TRACE(kTraceError, kTraceVideo, ViEId(engine_id_, channel_id_),
-                   "%s: could not set send bitrates", __FUNCTION__);
-      return -1;
-    }
+    rtp_rtcp_.SetSendBitrate(video_codec.startBitrate * 1000,
+                             video_codec.minBitrate,
+                             video_codec.maxBitrate);
   }
   // Enable this if H264 is available.
   // This sets the wanted packetization mode.
diff --git a/src/video_engine/vie_encoder.cc b/src/video_engine/vie_encoder.cc
index 60cb6abfec..8c2e610b08 100644
--- a/src/video_engine/vie_encoder.cc
+++ b/src/video_engine/vie_encoder.cc
@@ -273,14 +273,9 @@ WebRtc_Word32 ViEEncoder::SetEncoder(const webrtc::VideoCodec& video_codec) {
                video_codec.codecType, video_codec.width, video_codec.height);
 
   // Convert from kbps to bps.
-  if (default_rtp_rtcp_.SetSendBitrate(video_codec.startBitrate * 1000,
-                                       video_codec.minBitrate,
-                                       video_codec.maxBitrate) != 0) {
-    WEBRTC_TRACE(webrtc::kTraceError, webrtc::kTraceVideo,
-                 ViEId(engine_id_, channel_id_),
-                 "Could not set RTP module bitrates");
-    return -1;
-  }
+  default_rtp_rtcp_.SetSendBitrate(video_codec.startBitrate * 1000,
+                                   video_codec.minBitrate,
+                                   video_codec.maxBitrate);
 
   // Setting target width and height for VPM.
   if (vpm_.SetTargetResolution(video_codec.width, video_codec.height,