         
     }
     
-    func checkForConnectvity() -> Bool? {
-        
-        var message = ErrorMessages.noClipsAvailable.text
+    func checkForConnectvity() -> Bool {
+        
+        var message = ErrorMessages.noClipsInternet.text
         
         if self.reachability.hasInternetConnection() == false {
-            message = ErrorMessages.noClipsInternet.text
-            self.activityIndicator.stopAnimating()
-            self.showNoDataView()
-            self.tableView.isHidden = true
+            loadNoDataView(message: message, buttonTitle: "Retry")
+            return false
         } else {
             return true
         }
+        
+    }
+    
+    func checkForClipResults(mediaRefs: [MediaRef]?) -> Bool {
+        
+        var message = ErrorMessages.noClipsAvailable.text
+        
+        guard let mediaRefs = mediaRefs, mediaRefs.count > 0 else {
+            loadNoDataView(message: message, buttonTitle: nil)
+            return false
+        }
+        
+        return true
+        
+    }
+    
+    func loadNoDataView(message: String, buttonTitle: String?) {
         
         if let noDataView = self.view.subviews.first(where: { $0.tag == kNoDataViewTag}) {
             if let messageView = noDataView.subviews.first(where: {$0 is UILabel}), let messageLabel = messageView as? UILabel {

            }
        }
        else {
            self.addNoDataViewWithMessage(message, buttonTitle: "Retry", buttonImage: nil, retryPressed: #selector(ClipsTableViewController.resetAndRetrieveClips))
        }
        
        return false
    }
    
    func reloadClipData(mediaRefs: [MediaRef]? = nil) {

        retrieveClips()
    }
    
    func resetAndRetrieveClips() {
        resetClipQuery()
        retrieveClips()
