         self.clipQueryIsLoading = false
         self.clipQueryActivityIndicator.stopAnimating()
         
-        guard let mediaRefArray = mediaRefs, mediaRefArray.count > 0 || clipsArray.count > 0 else {
-            self.tableView.isHidden = true
-            self.showNoDataView()
+        guard checkForClipResults(mediaRefs: mediaRefs) == true || checkForClipResults(mediaRefs: self.clipsArray) == true, let mediaRefs = mediaRefs else {
             return
         }
         
-        guard mediaRefArray.count > 0 else {
+        guard checkForClipResults(mediaRefs: mediaRefs) == true else {
             self.clipQueryEndOfResultsReached = true
             self.clipQueryActivityIndicator.stopAnimating()
             self.clipQueryMessage.isHidden = false
             return
         }
         
-        for mediaRef in mediaRefArray {
+        for mediaRef in mediaRefs {
             self.clipsArray.append(mediaRef)
         }
         

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

        
    }
    
    func checkForConnectvity() -> Bool {
        
        var message = ErrorMessages.noClipsInternet.text
        
        if self.reachability.hasInternetConnection() == false {
            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 {
