diff --git a/src/org/linphone/ChatFragment.java b/src/org/linphone/ChatFragment.java
index 019f846d3..9038f1cd8 100644
--- a/src/org/linphone/ChatFragment.java
+++ b/src/org/linphone/ChatFragment.java
@@ -258,7 +258,9 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
 
 	@Override
 	public void onSaveInstanceState(Bundle outState) {
-		outState.putString("messageDraft", message.getText().toString());
+		if (message != null) {
+			outState.putString("messageDraft", message.getText().toString());
+		}
 		super.onSaveInstanceState(outState);
 	}