diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 3106a10f..c981a37e 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:a="http://schemas.android.com/apk/res/android"
     package="com.thejoshwa.ultrasonic.androidapp"
     a:installLocation="auto"
-    a:versionCode="41"
-    a:versionName="1.3.0.1" >
+    a:versionCode="42"
+    a:versionName="1.3.0.2" >
 
     <uses-permission a:name="android.permission.INTERNET" />
     <uses-permission a:name="android.permission.READ_PHONE_STATE" />
diff --git a/src/com/thejoshwa/ultrasonic/androidapp/view/SongView.java b/src/com/thejoshwa/ultrasonic/androidapp/view/SongView.java
index 9337dc86..a2267294 100644
--- a/src/com/thejoshwa/ultrasonic/androidapp/view/SongView.java
+++ b/src/com/thejoshwa/ultrasonic/androidapp/view/SongView.java
@@ -205,8 +205,15 @@ public class SongView extends UpdateView implements Checkable
 			durationTextView.setText(Util.formatTotalDuration(duration));
 		}
 
-		checkedTextView.setVisibility(checkable && !song.isVideo() ? View.VISIBLE : View.GONE);
-		songDragImageView.setVisibility(dragable ? View.VISIBLE : View.GONE);
+		if (checkedTextView != null)
+		{
+			checkedTextView.setVisibility(checkable && !song.isVideo() ? View.VISIBLE : View.GONE);
+		}
+
+		if (songDragImageView != null)
+		{
+			songDragImageView.setVisibility(dragable ? View.VISIBLE : View.GONE);
+		}
 
 		if (Util.isOffline(this.context))
 		{