diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 834c5db..490914b 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -19,6 +19,7 @@
 
 TODO - rework notes to incorporate: Changes since 1.1.1
 LOGGING-130 - Potential missing privileged block for class loader
+LOGGING-145 - LogFactoryImpl.setAttribute - possible NPE
 
 $Id$
 
diff --git a/src/java/org/apache/commons/logging/impl/LogFactoryImpl.java b/src/java/org/apache/commons/logging/impl/LogFactoryImpl.java
index 44d003c..ea891cb 100644
--- a/src/java/org/apache/commons/logging/impl/LogFactoryImpl.java
+++ b/src/java/org/apache/commons/logging/impl/LogFactoryImpl.java
@@ -406,7 +406,7 @@ public class LogFactoryImpl extends LogFactory {
         }
         
         if (name.equals(TCCL_KEY)) {
-            useTCCL = Boolean.valueOf(value.toString()).booleanValue();
+            useTCCL = value != null && Boolean.valueOf(value.toString()).booleanValue();
         }
 
     }