--- a/artifacts/src/main/java/org/dive4elements/river/jfree/XYStyle.java	Wed Sep 25 18:04:14 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/jfree/XYStyle.java	Wed Sep 25 18:04:49 2013 +0200
@@ -41,7 +41,11 @@
      * whether to draw lines and/or points.
      */
     @Override
-    public XYLineAndShapeRenderer applyTheme(XYLineAndShapeRenderer r, int idx){
+    public XYLineAndShapeRenderer applyTheme(XYLineAndShapeRenderer r, int idx) {
+        if (theme == null) {
+            // Hurray we already applied nothing :)
+            return r;
+        }
         this.renderer = r;
         applyLineColor(r, idx);
         applyLineSize(r, idx);