diff --git a/indra/llkdu/llimagej2ckdu.cpp b/indra/llkdu/llimagej2ckdu.cpp
index efa75e4ebd2e2d80c3e3e8ed917af6c48972ad78..c0db63a85bc04b35989ff6258fdc260c13242004 100644
--- a/indra/llkdu/llimagej2ckdu.cpp
+++ b/indra/llkdu/llimagej2ckdu.cpp
@@ -231,13 +231,13 @@ void LLImageJ2CKDU::setupCodeStream(LLImageJ2C &base, BOOL keep_codestream, ECod
 
 	if (!mInputp)
 	{
-		llassert(base.getData());
+		llassert_always(base.getData());
 		// The compressed data has been loaded
 		// Setup the source for the codestrea
 		mInputp = new LLKDUMemSource(base.getData(), data_size);
 	}
 
-	llassert(mInputp);
+	llassert_always(mInputp);
 	mInputp->reset();
 	mCodeStreamp = new kdu_codestream;
 
diff --git a/indra/llkdu/tests/llimagej2ckdu_test.cpp b/indra/llkdu/tests/llimagej2ckdu_test.cpp
index 10f4ceb9ef1f0f910d6ff76632723d4d2e5ff86b..b3c3da20e2e1db9eecef5f5abf385e8ff665b09c 100644
--- a/indra/llkdu/tests/llimagej2ckdu_test.cpp
+++ b/indra/llkdu/tests/llimagej2ckdu_test.cpp
@@ -219,7 +219,7 @@ namespace tut
 	{
 		LLImageJ2C* image = new LLImageJ2C();
 		BOOL res = mImage->callGetMetadata(*image);
-		// Trying to set up a data stream with all NIL values will fail and return FALSE
+		// Trying to set up a data stream with all NIL values will throw an exception that will be caught and will return FALSE
 		ensure("getMetadata() test failed", res == FALSE);
 	}