diff --git a/src/ICSharpCode.SharpZipLib/BZip2/BZip2.cs b/src/ICSharpCode.SharpZipLib/BZip2/BZip2.cs
index ec6ff9402..4bd48b035 100644
--- a/src/ICSharpCode.SharpZipLib/BZip2/BZip2.cs
+++ b/src/ICSharpCode.SharpZipLib/BZip2/BZip2.cs
@@ -17,10 +17,11 @@ public static class BZip2
 		/// <param name="isStreamOwner">Both streams are closed on completion if true.</param>
 		public static void Decompress(Stream inStream, Stream outStream, bool isStreamOwner)
 		{
-			if (inStream == null || outStream == null)
-			{
-				throw new Exception("Null Stream");
-			}
+			if (inStream == null)
+				throw new ArgumentNullException(nameof(inStream));
+
+			if (outStream == null)
+				throw new ArgumentNullException(nameof(outStream));
 
 			try
 			{
@@ -51,10 +52,11 @@ public static void Decompress(Stream inStream, Stream outStream, bool isStreamOw
 		/// the lowest compression and 9 the highest.</param>
 		public static void Compress(Stream inStream, Stream outStream, bool isStreamOwner, int level)
 		{
-			if (inStream == null || outStream == null)
-			{
-				throw new Exception("Null Stream");
-			}
+			if (inStream == null)
+				throw new ArgumentNullException(nameof(inStream));
+
+			if (outStream == null)
+				throw new ArgumentNullException(nameof(outStream));
 
 			try
 			{