diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/uart/UARTControlFragment.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/uart/UARTControlFragment.java
index 0a653dca..aecae3be 100644
--- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/uart/UARTControlFragment.java
+++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/uart/UARTControlFragment.java
@@ -105,6 +105,8 @@ public class UARTControlFragment extends Fragment implements GridView.OnItemClic
 			final Command command = (Command)mAdapter.getItem(position);
 			final Command.Eol eol = command.getEol();
 			String text = command.getCommand();
+			if (text == null)
+				text = "";
 			switch (eol) {
 				case CR_LF:
 					text = text.replaceAll("\n", "\r\n");