diff --git a/Source/OpenTK/Audio/AudioContext.cs b/Source/OpenTK/Audio/AudioContext.cs
index baafac96..b5a876ac 100644
--- a/Source/OpenTK/Audio/AudioContext.cs
+++ b/Source/OpenTK/Audio/AudioContext.cs
@@ -325,33 +325,14 @@ namespace OpenTK.Audio
             lock (audio_context_lock)
             {
                 if (!Alc.MakeContextCurrent(context != null ? (IntPtr)context.context_handle : IntPtr.Zero))
-                    throw new AudioContextException(Alc.GetError(
-                        context != null ? (IntPtr)context.context_handle : IntPtr.Zero).ToString());
+                    throw new AudioContextException(String.Format("ALC {0} error detected at {1}.",
+                        Alc.GetError(context != null ? (IntPtr)context.context_handle : IntPtr.Zero).ToString(),
+                        context != null ? context.ToString() : "null"));
             }
         }
 
         #endregion
 
-        #region internal void MakeCurrent()
-
-        /// <summary>Makes the AudioContext current in the calling thread.</summary>
-        /// <exception cref="ObjectDisposedException">
-        /// Occurs if this function is called after the AudioContext has been disposed.
-        /// </exception>
-        /// <exception cref="AudioContextException">
-        /// Occurs when the AudioContext could not be made current.
-        /// </exception>
-        /// <remarks>
-        /// Only one AudioContext can be current in the application at any time,
-        /// <b>regardless of the number of threads</b>.
-        /// </remarks>
-        internal void MakeCurrent()
-        {
-            AudioContext.MakeCurrent(this);
-        }
-
-        #endregion
-
         #region internal bool IsCurrent
 
         /// <summary>
@@ -392,6 +373,26 @@ namespace OpenTK.Audio
 
         #region --- Public Members ---
 
+        #region internal void MakeCurrent()
+
+        /// <summary>Makes the AudioContext current in the calling thread.</summary>
+        /// <exception cref="ObjectDisposedException">
+        /// Occurs if this function is called after the AudioContext has been disposed.
+        /// </exception>
+        /// <exception cref="AudioContextException">
+        /// Occurs when the AudioContext could not be made current.
+        /// </exception>
+        /// <remarks>
+        /// Only one AudioContext can be current in the application at any time,
+        /// <b>regardless of the number of threads</b>.
+        /// </remarks>
+        public void MakeCurrent()
+        {
+            AudioContext.MakeCurrent(this);
+        }
+
+        #endregion
+
         #region public bool IsProcessing
 
         /// <summary>