--- a/graal/com.oracle.truffle.ruby.runtime/src/com/oracle/truffle/ruby/runtime/RubyContext.java	Wed Jan 15 15:11:47 2014 +0100
+++ b/graal/com.oracle.truffle.ruby.runtime/src/com/oracle/truffle/ruby/runtime/RubyContext.java	Wed Jan 15 19:27:27 2014 +0000
@@ -81,16 +81,11 @@
         // Must initialize threads before fibers
 
         threadManager = new ThreadManager(this);
-
-        if (configuration.getRubyVersion().is19OrLater()) {
-            fiberManager = new FiberManager(this);
-        } else {
-            fiberManager = null;
-        }
+        fiberManager = new FiberManager(this);
     }
 
     public String getLanguageShortName() {
-        return configuration.getRubyVersion().getShortName();
+        return "Ruby";
     }
 
     public RubyDebugManager getDebugManager() {
@@ -187,11 +182,7 @@
         } catch (RaiseException e) {
             throw e;
         } catch (ThrowException e) {
-            if (context.getConfiguration().getRubyVersion().is18OrEarlier()) {
-                throw new RaiseException(context.getCoreLibrary().nameErrorUncaughtThrow(e.getTag()));
-            } else {
-                throw new RaiseException(context.getCoreLibrary().argumentErrorUncaughtThrow(e.getTag()));
-            }
+            throw new RaiseException(context.getCoreLibrary().argumentErrorUncaughtThrow(e.getTag()));
         } catch (BreakShellException | QuitException e) {
             throw e;
         } catch (Throwable e) {