1 files changed, 12 insertions, 1 deletions
diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/archive/CbrComicArchive.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/archive/CbrComicArchive.java
index 9e37bbc..b16d84b 100755
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/archive/CbrComicArchive.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/archive/CbrComicArchive.java
@@ -30,6 +30,17 @@ public class CbrComicArchive extends ComicArchive {
 
     @Override
     public InputStream getItem(int index) throws IOException {
+        try {
+            return new ByteArrayInputStream(getByteArray(index));
+        } catch (NullPointerException e) {
+            e.printStackTrace();
+
+            return null;
+        }
+    }
+
+    @Override
+    public byte[] getByteArray(int index) throws IOException {
         FileHeader fh = m_entries.get(index).m_fh;
 
         ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -37,7 +48,7 @@ public class CbrComicArchive extends ComicArchive {
         try {
             m_archive.extractFile(fh, out);
 
-            return new ByteArrayInputStream(out.toByteArray());
+            return out.toByteArray();
         } catch (RarException e) {
             e.printStackTrace();