--- a/databuffer.h	Sat Jul 28 17:57:37 2012 +0300
+++ b/databuffer.h	Sun Jul 29 04:02:07 2012 +0300
@@ -106,6 +106,9 @@
 	
 	// Merge another data buffer into this one.
 	void Merge (DataBuffer* other) {
+		if (!other)
+				return;
+		
 		for (unsigned int x = 0; x < other->writesize; x++) {
 			unsigned char c = *(other->buffer+x);
 			Write<unsigned char> (c);