diff --git a/Paintroid/src/main/java/org/catrobat/paintroid/command/implementation/DefaultCommandManager.kt b/Paintroid/src/main/java/org/catrobat/paintroid/command/implementation/DefaultCommandManager.kt
index 140224b805..1c36a4608a 100644
--- a/Paintroid/src/main/java/org/catrobat/paintroid/command/implementation/DefaultCommandManager.kt
+++ b/Paintroid/src/main/java/org/catrobat/paintroid/command/implementation/DefaultCommandManager.kt
@@ -335,6 +335,9 @@ class DefaultCommandManager(
     }
 
     override fun adjustUndoListForClippingTool() {
+        if (undoCommandList.first.toString().split(".", "@").size < FIVE) {
+            return
+        }
         val commandName = undoCommandList.first.toString().split(".", "@")[FIVE]
         if (commandName == ClippingCommand::class.java.simpleName) {
             val clippingCommand = undoCommandList.pop()
diff --git a/build.gradle b/build.gradle
index c03d8c5eaf..9734277b42 100644
--- a/build.gradle
+++ b/build.gradle
@@ -47,8 +47,8 @@ ext {
 
     androidSupportLibraryVersion = '28.0.0'
 
-    androidVersionCode = 49
-    androidVersionName = '2.10.0'
+    androidVersionCode = 50
+    androidVersionName = '2.10.1'
 }
 
 if(project.hasProperty("snapshot")) {