diff --git a/src/apps/icon-o-matic/gui/TransformerListView.cpp b/src/apps/icon-o-matic/gui/TransformerListView.cpp
index 8b7eba1c20..17b9396d45 100644
--- a/src/apps/icon-o-matic/gui/TransformerListView.cpp
+++ b/src/apps/icon-o-matic/gui/TransformerListView.cpp
@@ -400,14 +400,13 @@ TransformerListView::SetShape(Shape* shape)
 
 	fShape = shape;
 
-	if (!fShape)
-		return;
-
-	fShape->AddListener(this);
-
-	int32 count = fShape->CountTransformers();
-	for (int32 i = 0; i < count; i++)
-		_AddTransformer(fShape->TransformerAtFast(i), i);
+	if (fShape) {
+		fShape->AddListener(this);
+	
+		int32 count = fShape->CountTransformers();
+		for (int32 i = 0; i < count; i++)
+			_AddTransformer(fShape->TransformerAtFast(i), i);
+	}
 
 	_UpdateMenu();
 }
diff --git a/src/apps/icon-o-matic/style/AssignStyleCommand.cpp b/src/apps/icon-o-matic/style/AssignStyleCommand.cpp
index 799697ba4d..13c86c4c0c 100644
--- a/src/apps/icon-o-matic/style/AssignStyleCommand.cpp
+++ b/src/apps/icon-o-matic/style/AssignStyleCommand.cpp
@@ -38,7 +38,7 @@ AssignStyleCommand::~AssignStyleCommand()
 status_t
 AssignStyleCommand::InitCheck()
 {
-	return fShape && fOldStyle && fNewStyle ? B_OK : B_NO_INIT;
+	return fShape && fNewStyle ? B_OK : B_NO_INIT;
 }
 
 // Perform