2 files changed, 7 insertions, 3 deletions
diff --git a/main/src/cgeo/geocaching/ui/dialog/CoordinatesInputDialog.java b/main/src/cgeo/geocaching/ui/dialog/CoordinatesInputDialog.java
index f2a8c7d..283b7fd 100644
--- a/main/src/cgeo/geocaching/ui/dialog/CoordinatesInputDialog.java
+++ b/main/src/cgeo/geocaching/ui/dialog/CoordinatesInputDialog.java
@@ -178,7 +178,7 @@ public class CoordinatesInputDialog extends DialogFragment {
         final Button buttonClipboard = ButterKnife.findById(v, R.id.clipboard);
         try {
             @SuppressWarnings("unused")
-            final Geopoint geopoint = new Geopoint(ClipboardUtils.getText());
+            final Geopoint geopoint = new Geopoint(StringUtils.defaultString(ClipboardUtils.getText()));
             buttonClipboard.setOnClickListener(new ClipboardListener());
             buttonClipboard.setVisibility(View.VISIBLE);
         } catch (final ParseException e) {
@@ -519,7 +519,7 @@ public class CoordinatesInputDialog extends DialogFragment {
         @Override
         public void onClick(final View v) {
             try {
-                gp = new Geopoint(ClipboardUtils.getText());
+                gp = new Geopoint(StringUtils.defaultString(ClipboardUtils.getText()));
                 updateGUI();
             } catch (final ParseException e) {
             }
diff --git a/main/src/cgeo/geocaching/utils/ClipboardUtils.java b/main/src/cgeo/geocaching/utils/ClipboardUtils.java
index 6be5b7f..fb30886 100644
--- a/main/src/cgeo/geocaching/utils/ClipboardUtils.java
+++ b/main/src/cgeo/geocaching/utils/ClipboardUtils.java
@@ -2,6 +2,8 @@ package cgeo.geocaching.utils;
 
 import cgeo.geocaching.CgeoApplication;
 
+import org.eclipse.jdt.annotation.Nullable;
+
 import android.content.Context;
 
 /**
@@ -33,10 +35,12 @@ public final class ClipboardUtils {
      *
      */
     @SuppressWarnings("deprecation")
+    @Nullable
     public static String getText() {
         // fully qualified name used here to avoid buggy deprecation warning (of javac) on the import statement
         final android.text.ClipboardManager clipboard = (android.text.ClipboardManager) CgeoApplication.getInstance().getSystemService(Context.CLIPBOARD_SERVICE);
-        return clipboard.getText().toString();
+        final CharSequence text = clipboard.getText();
+        return text != null ? text.toString() : null;
     }
 
 }