Clean up exception class, move up in require order

3 files changed, 4 insertions, 5 deletions

diff --git a/bin/ruby2d b/bin/ruby2d
index 98a1e7e..06e1fd2 100755
--- a/bin/ruby2d
+++ b/bin/ruby2d
@@ -15,6 +15,7 @@ end
 
 # The Ruby 2D library files
 @lib_files = [
+  'exceptions',
   'color',
   'window',
   'application',
@@ -26,7 +27,6 @@ end
   'image',
   'sprite',
   'text',
-  'exceptions'
 ]
 
 
diff --git a/lib/ruby2d.rb b/lib/ruby2d.rb
index 4e41d22..125ad82 100644
--- a/lib/ruby2d.rb
+++ b/lib/ruby2d.rb
@@ -1,5 +1,6 @@
 # ruby2d.rb
 
+require 'ruby2d/exceptions'
 require 'ruby2d/color'
 require 'ruby2d/window'
 require 'ruby2d/application'
@@ -11,7 +12,6 @@ require 'ruby2d/triangle'
 require 'ruby2d/image'
 require 'ruby2d/sprite'
 require 'ruby2d/text'
-require 'ruby2d/exceptions'
 require 'ruby2d/ruby2d'  # load native extension
 
 include Ruby2D::DSL
diff --git a/lib/ruby2d/exceptions.rb b/lib/ruby2d/exceptions.rb
index 9ea90c7..84880e1 100644
--- a/lib/ruby2d/exceptions.rb
+++ b/lib/ruby2d/exceptions.rb
@@ -8,9 +8,8 @@ module Ruby2D
     
     def initialize(msg)
       super(msg)
-      puts error("\nRuby 2D Error:") << " " << msg
-      puts bold("Occurred in:")
-      puts bold("  " + caller.last), "\n"
+      puts error("\nRuby 2D Error:") << " #{msg}" <<
+      bold("\nOccurred in:\n  #{caller.last}\n")
     end
   end
 end