diff --git a/app/src/main/java/org/isoron/uhabits/widgets/BaseWidgetProvider.java b/app/src/main/java/org/isoron/uhabits/widgets/BaseWidgetProvider.java
index b75493a76..558a5da41 100644
--- a/app/src/main/java/org/isoron/uhabits/widgets/BaseWidgetProvider.java
+++ b/app/src/main/java/org/isoron/uhabits/widgets/BaseWidgetProvider.java
@@ -107,15 +107,19 @@ public abstract class BaseWidgetProvider extends AppWidgetProvider
         Habit habit = Habit.get(habitId);
         if(habit == null)
         {
-            RemoteViews errorView = new RemoteViews(context.getPackageName(),
-                    R.layout.widget_error);
-            manager.updateAppWidget(widgetId, errorView);
+            drawErrorWidget(context, manager, widgetId);
             return;
         }
 
         new RenderWidgetTask(widgetId, context, habit, manager).execute();
     }
 
+    private void drawErrorWidget(Context context, AppWidgetManager manager, int widgetId)
+    {
+        RemoteViews errorView = new RemoteViews(context.getPackageName(), R.layout.widget_error);
+        manager.updateAppWidget(widgetId, errorView);
+    }
+
     protected abstract void refreshCustomViewData(View widgetView);
 
     private void savePreview(Context context, int widgetId, Bitmap widgetCache)
@@ -231,19 +235,28 @@ public abstract class BaseWidgetProvider extends AppWidgetProvider
         @Override
         protected void onPostExecute(Void aVoid)
         {
-            widgetView.invalidate();
-            widgetView.setDrawingCacheEnabled(true);
-            widgetView.buildDrawingCache(true);
-            Bitmap drawingCache = widgetView.getDrawingCache();
-            remoteViews.setTextViewText(R.id.label, habit.name);
-            remoteViews.setImageViewBitmap(R.id.imageView, drawingCache);
-
-            //savePreview(context, widgetId, drawingCache);
-
-            PendingIntent onClickIntent = getOnClickPendingIntent(context, habit);
-            if(onClickIntent != null) remoteViews.setOnClickPendingIntent(R.id.imageView, onClickIntent);
-
-            manager.updateAppWidget(widgetId, remoteViews);
+            try
+            {
+                widgetView.invalidate();
+                widgetView.setDrawingCacheEnabled(true);
+                widgetView.buildDrawingCache(true);
+                Bitmap drawingCache = widgetView.getDrawingCache();
+                remoteViews.setTextViewText(R.id.label, habit.name);
+                remoteViews.setImageViewBitmap(R.id.imageView, drawingCache);
+
+                //savePreview(context, widgetId, drawingCache);
+
+                PendingIntent onClickIntent = getOnClickPendingIntent(context, habit);
+                if (onClickIntent != null) remoteViews.setOnClickPendingIntent(R.id.imageView,
+                        onClickIntent);
+
+                manager.updateAppWidget(widgetId, remoteViews);
+            }
+            catch (Exception e)
+            {
+                drawErrorWidget(context, manager, widgetId);
+                e.printStackTrace();
+            }
 
             super.onPostExecute(aVoid);
         }
diff --git a/app/src/main/res/layout/widget_error.xml b/app/src/main/res/layout/widget_error.xml
index 37155adf6..2c2ab79e4 100644
--- a/app/src/main/res/layout/widget_error.xml
+++ b/app/src/main/res/layout/widget_error.xml
@@ -35,7 +35,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center"
-        android:text="Habit not found"
+        android:text="Error drawing widget"
         android:textColor="#ffffff"/>
 
 </LinearLayout>
\ No newline at end of file