diff --git a/android/src/main/java/com/horcrux/svg/SvgView.java b/android/src/main/java/com/horcrux/svg/SvgView.java
index cdd753c5..f41719cd 100644
--- a/android/src/main/java/com/horcrux/svg/SvgView.java
+++ b/android/src/main/java/com/horcrux/svg/SvgView.java
@@ -88,7 +88,8 @@ public class SvgView extends ReactViewGroup implements ReactCompoundView, ReactC
         if (mBitmap == null) {
             mBitmap = drawOutput();
         }
-        canvas.drawBitmap(mBitmap, 0, 0, null);
+        if (mBitmap != null)
+            canvas.drawBitmap(mBitmap, 0, 0, null);
     }
 
     @Override
@@ -214,6 +215,9 @@ public class SvgView extends ReactViewGroup implements ReactCompoundView, ReactC
             height = (float) PropHelper.fromRelative(mbbHeight, parentHeight, 0, mScale, 12);
             setMeasuredDimension((int)Math.ceil(width), (int)Math.ceil(height));
         }
+        if (width == 0 || height == 0) {
+            return null;
+        }
         Bitmap bitmap = Bitmap.createBitmap(
                 (int) width,
                 (int) height,