diff --git a/base/org.codehaus.groovy30/src/groovy/grape/GrapeIvy.groovy b/base/org.codehaus.groovy30/src/groovy/grape/GrapeIvy.groovy
index 62565bf562..6d173263b4 100644
--- a/base/org.codehaus.groovy30/src/groovy/grape/GrapeIvy.groovy
+++ b/base/org.codehaus.groovy30/src/groovy/grape/GrapeIvy.groovy
@@ -177,9 +177,11 @@ class GrapeIvy implements GrapeEngine {
             if (!isValidTargetClassLoader(loader)) {
                 loader = GrapeIvy.getClass().getClassLoader()
             }*/
+            /* GRECLIPSE edit -- removing this only affects the GrapeIvy used during compilation, where the ClassLoader doesn't matter
             if (!isValidTargetClassLoader(loader)) {
                 throw new RuntimeException('No suitable ClassLoader found for grab')
             }
+            */
         }
         loader
     }
diff --git a/ide-test/org.codehaus.groovy.eclipse.tests/src/org/codehaus/groovy/eclipse/test/GroovyEclipseTestSuite.groovy b/ide-test/org.codehaus.groovy.eclipse.tests/src/org/codehaus/groovy/eclipse/test/GroovyEclipseTestSuite.groovy
index 35c886769b..6b3d190356 100644
--- a/ide-test/org.codehaus.groovy.eclipse.tests/src/org/codehaus/groovy/eclipse/test/GroovyEclipseTestSuite.groovy
+++ b/ide-test/org.codehaus.groovy.eclipse.tests/src/org/codehaus/groovy/eclipse/test/GroovyEclipseTestSuite.groovy
@@ -91,7 +91,7 @@ abstract class GroovyEclipseTestSuite {
 
     @After
     final void tearDownTestCase() {
-        GroovyPlugin.default.activeWorkbenchWindow.activePage.closeAllEditors(false)
+        GroovyPlugin.default.activeWorkbenchWindow?.activePage?.closeAllEditors(false)
         testProject.deleteWorkingCopies()
 
         testProject.project.build(IncrementalProjectBuilder.CLEAN_BUILD, null)
diff --git a/ide-test/org.codehaus.groovy.eclipse.tests/src/org/codehaus/groovy/eclipse/test/launch/GroovyScriptLaunchShortcutTests.groovy b/ide-test/org.codehaus.groovy.eclipse.tests/src/org/codehaus/groovy/eclipse/test/launch/GroovyScriptLaunchShortcutTests.groovy
index 23abf48f7e..7dea982171 100644
--- a/ide-test/org.codehaus.groovy.eclipse.tests/src/org/codehaus/groovy/eclipse/test/launch/GroovyScriptLaunchShortcutTests.groovy
+++ b/ide-test/org.codehaus.groovy.eclipse.tests/src/org/codehaus/groovy/eclipse/test/launch/GroovyScriptLaunchShortcutTests.groovy
@@ -276,10 +276,8 @@ final class GroovyScriptLaunchShortcutTests extends GroovyEclipseTestSuite {
     @Test // https://github.com/groovy/groovy-eclipse/issues/779
     void testScriptLaunch13() {
         def unit = addGroovySource('''\
-            |@Grapes([
-            |  @GrabConfig(systemClassLoader=true),
-            |  @Grab('mysql:mysql-connector-java:5.1.6')
-            |])
+            |@GrabConfig(systemClassLoader=true)
+            |@Grab('mysql:mysql-connector-java:5.1.6')
             |def xxx
             |
             |println "Why won't this run?"