diff --git a/src/NzbDrone.Core/Indexers/Definitions/Rarbg/Rarbg.cs b/src/NzbDrone.Core/Indexers/Definitions/Rarbg/Rarbg.cs
index 8618ff78c..3455964da 100644
--- a/src/NzbDrone.Core/Indexers/Definitions/Rarbg/Rarbg.cs
+++ b/src/NzbDrone.Core/Indexers/Definitions/Rarbg/Rarbg.cs
@@ -58,7 +58,7 @@ public static void CheckResponseByStatusCode(IndexerResponse response)
                 case (int)HttpStatusCode.OK:
                     break;
                 default:
-                    throw new IndexerException(response, "Indexer API call returned an unexpected StatusCode [{0}]", responseCode);
+                    throw new IndexerException(response, "Indexer API call returned an unexpected status code [{0}]", responseCode);
             }
         }
 
@@ -112,9 +112,9 @@ private IndexerCapabilities SetCapabilities()
             return caps;
         }
 
-        protected override async Task<IndexerQueryResult> FetchPage(IndexerRequest request, IParseIndexerResponse parser)
+        protected override async Task<IndexerResponse> FetchIndexerResponse(IndexerRequest request)
         {
-            var response = await FetchIndexerResponse(request);
+            var response = await base.FetchIndexerResponse(request);
 
             CheckResponseByStatusCode(response);
 
@@ -133,36 +133,19 @@ protected override async Task<IndexerQueryResult> FetchPage(IndexerRequest reque
                     qs.Set("token", newToken);
 
                     request.HttpRequest.Url = request.Url.SetQuery(qs.GetQueryString());
-                    response = await FetchIndexerResponse(request);
+
+                    return await FetchIndexerResponse(request);
                 }
-                else if (jsonResponse.Resource.error_code is 5)
+
+                if (jsonResponse.Resource.error_code is 5)
                 {
                     _logger.Debug("Rarbg temp rate limit hit, retrying request");
-                    response = await FetchIndexerResponse(request);
+
+                    return await FetchIndexerResponse(request);
                 }
             }
 
-            try
-            {
-                var releases = parser.ParseResponse(response).ToList();
-
-                if (releases.Count == 0)
-                {
-                    _logger.Trace(response.Content);
-                }
-
-                return new IndexerQueryResult
-                {
-                    Releases = releases,
-                    Response = response.HttpResponse
-                };
-            }
-            catch (Exception ex)
-            {
-                ex.WithData(response.HttpResponse, 128 * 1024);
-                _logger.Trace("Unexpected Response content ({0} bytes): {1}", response.HttpResponse.ResponseData.Length, response.HttpResponse.Content);
-                throw;
-            }
+            return response;
         }
 
         public override object RequestAction(string action, IDictionary<string, string> query)
diff --git a/src/NzbDrone.Core/Indexers/Definitions/Rarbg/RarbgRequestGenerator.cs b/src/NzbDrone.Core/Indexers/Definitions/Rarbg/RarbgRequestGenerator.cs
index 31eddb7a9..cfa678047 100644
--- a/src/NzbDrone.Core/Indexers/Definitions/Rarbg/RarbgRequestGenerator.cs
+++ b/src/NzbDrone.Core/Indexers/Definitions/Rarbg/RarbgRequestGenerator.cs
@@ -46,11 +46,11 @@ private IEnumerable<IndexerRequest> GetRequest(bool isRssSearch, string term, in
                 {
                     requestBuilder.AddQueryParam("search_imdb", imdbId);
                 }
-                else if (tmdbId.HasValue && tmdbId > 0)
+                else if (tmdbId is > 0)
                 {
                     requestBuilder.AddQueryParam("search_themoviedb", tmdbId);
                 }
-                else if (tvdbId.HasValue && tvdbId > 0)
+                else if (tvdbId is > 0)
                 {
                     requestBuilder.AddQueryParam("search_tvdb", tvdbId);
                 }
diff --git a/src/NzbDrone.Core/Indexers/Definitions/Rarbg/RarbgTokenProvider.cs b/src/NzbDrone.Core/Indexers/Definitions/Rarbg/RarbgTokenProvider.cs
index c8e74377b..f85bc8797 100644
--- a/src/NzbDrone.Core/Indexers/Definitions/Rarbg/RarbgTokenProvider.cs
+++ b/src/NzbDrone.Core/Indexers/Definitions/Rarbg/RarbgTokenProvider.cs
@@ -47,7 +47,7 @@ public string GetToken(RarbgSettings settings, TimeSpan rateLimit)
 
                     return response.Resource["token"].ToString();
                 },
-                TimeSpan.FromMinutes(14.0));
+                TimeSpan.FromMinutes(14));
         }
     }
 }