diff --git a/OpenSourceController/Classes/Controller/OpenSourceViewController.swift b/OpenSourceController/Classes/Controller/OpenSourceViewController.swift
index 0ebc918..48f8465 100644
--- a/OpenSourceController/Classes/Controller/OpenSourceViewController.swift
+++ b/OpenSourceController/Classes/Controller/OpenSourceViewController.swift
@@ -126,9 +126,7 @@ class OpenSourceViewController: UITableViewController {
                                            reuseIdentifier: self.reuseIdentifier)
         }
 
-        if let licences = self.downloadedLicence,
-            indexPath.row < licences.count {
-            let licence = licences[indexPath.row]
+        if let licence = self.downloadedLicence?.get(at: indexPath.row) {
             cell?.configure(licence: licence)
         }
 
diff --git a/OpenSourceController/Classes/Extensions/Array+Extensions.swift b/OpenSourceController/Classes/Extensions/Array+Extensions.swift
new file mode 100644
index 0000000..8a9613a
--- /dev/null
+++ b/OpenSourceController/Classes/Extensions/Array+Extensions.swift
@@ -0,0 +1,22 @@
+//
+//  Array+Extensions.swift
+//  Pods
+//
+//  Created by Florian Gabach on 03/03/2017.
+//
+//
+
+import Foundation
+
+extension Array {
+    
+    /// Get an index safely 
+    public func get(at index: Int) -> Element? {
+        guard index >= 0 
+            && index < count else { 
+                return nil 
+        }
+        
+        return self[index]
+    }
+}