1 files changed, 21 insertions, 4 deletions
diff --git a/BJC-Utils2/src/main/java/bjc/utils/data/Pair.java b/BJC-Utils2/src/main/java/bjc/utils/data/Pair.java
index d0397f7..03f2eed 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/data/Pair.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/data/Pair.java
@@ -92,15 +92,32 @@ public class Pair<L, R> implements IPair<L, R> {
 
 		return merger.apply(leftValue, rightValue);
 	}
-	
+
 	@Override
 	public String toString() {
-		return "pair[l=" + leftValue.toString() + ", r=" + rightValue.toString() + "]";
+		String leftValueString;
+
+		if (leftValue != null) {
+			leftValueString = leftValue.toString();
+		} else {
+			leftValueString = "(null)";
+		}
+
+		String rightValueString;
+
+		if (rightValue != null) {
+			rightValueString = rightValue.toString();
+		} else {
+			rightValueString = "(null)";
+		}
+		
+		return "pair[l=" + leftValueString + ", r=" + rightValueString
+				+ "]";
 	}
 
 	@Override
-	public <L2, R2> IPair<L2, R2>
-			bind(BiFunction<L, R, IPair<L2, R2>> binder) {
+	public <L2, R2> IPair<L2, R2> bind(
+			BiFunction<L, R, IPair<L2, R2>> binder) {
 		return binder.apply(leftValue, rightValue);
 	}
 }