diff --git a/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableModelAdapter.java b/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableModelAdapter.java
index acea8dcc57..0ec8fe90c6 100644
--- a/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableModelAdapter.java
+++ b/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableModelAdapter.java
@@ -244,7 +244,7 @@ public abstract class UITableModelAdapter<T extends Object> extends AbstractTabl
                     FineLoggerFactory.getLogger().error(ee.getMessage(), ee);
 				}
 			}
-			if (getRowCount() < 1 || selectedRow.length < 0) {
+			if (getRowCount() < 1) {
 				return;
 			}
 			
diff --git a/designer-base/src/main/java/com/fr/design/gui/itabpane/UITabsHeaderIconPane.java b/designer-base/src/main/java/com/fr/design/gui/itabpane/UITabsHeaderIconPane.java
index 1c3f004f91..45db9b8a6f 100644
--- a/designer-base/src/main/java/com/fr/design/gui/itabpane/UITabsHeaderIconPane.java
+++ b/designer-base/src/main/java/com/fr/design/gui/itabpane/UITabsHeaderIconPane.java
@@ -153,6 +153,7 @@ public class UITabsHeaderIconPane extends JPanel implements UITabComponent {
 								try {
 									Thread.sleep(3);
 								} catch (InterruptedException e) {
+									Thread.currentThread().interrupt();
 								}
 							}
 							if (currentPanel != panel) {
@@ -202,7 +203,7 @@ public class UITabsHeaderIconPane extends JPanel implements UITabComponent {
 	}
 
 	@Override
-	public int getSelectedIndex() {
+	public synchronized int getSelectedIndex() {
 		return selectedIndex;
 	}
 
diff --git a/designer-base/src/main/java/com/fr/design/gui/style/NumberDragBar.java b/designer-base/src/main/java/com/fr/design/gui/style/NumberDragBar.java
index 5ab5c16985..dce3dc86dd 100644
--- a/designer-base/src/main/java/com/fr/design/gui/style/NumberDragBar.java
+++ b/designer-base/src/main/java/com/fr/design/gui/style/NumberDragBar.java
@@ -127,6 +127,7 @@ public class NumberDragBar extends JComponent {
 					revalidate();
 				} catch (InterruptedException e) {
                     FineLoggerFactory.getLogger().error(e.toString());
+					Thread.currentThread().interrupt();
 				}
 			}
 		});
diff --git a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/RSyntaxDocument.java b/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/RSyntaxDocument.java
index d0c3ba93b6..d606bef261 100644
--- a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/RSyntaxDocument.java
+++ b/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/RSyntaxDocument.java
@@ -366,7 +366,9 @@ public class RSyntaxDocument extends RDocument implements Iterable<Token>,
 	 */
 	public boolean getShouldIndentNextLine(int line) {
 		Token t = getTokenListForLine(line);
-		t = t.getLastNonCommentNonWhitespaceToken();
+		if (t != null) {
+			t = t.getLastNonCommentNonWhitespaceToken();
+		}
 		return tokenMaker.getShouldIndentNextLineAfter(t);
 	}