diff --git a/panels/dataInput.R b/panels/dataInput.R
index 5a6a55b050d0a802b590d8252ea3e6778422ef56..305aad7012d44b99e1b626268589a6d38831bc7e 100644
--- a/panels/dataInput.R
+++ b/panels/dataInput.R
@@ -127,9 +127,13 @@ observeEvent(input$okData, {
         "demo" =
           {
             message <- as.character(input$demo)
-            data(GlobalPatterns)
-            load("demo/demo.RData")
-            get(input$demo)
+            ne <- new.env()
+            if (!is.null(input$demo))
+            {
+              data(GlobalPatterns)
+              load("demo/demo.RData", envir = ne)
+              get(input$demo)
+            }
           },
         "input" =
           {