diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/DeclareRecordAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/DeclareRecordAction.java
index 9bee4dccbc..a116e8e28c 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/DeclareRecordAction.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/DeclareRecordAction.java
@@ -150,7 +150,7 @@ public class DeclareRecordAction extends RMActionExecuterAbstractBase
             }
         }
 
-        if (result != false)
+        if (result)
         {
             Set<QName> aspects = this.nodeService.getAspects(nodeRef);
             for (QName aspect : aspects)
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/RMv21BehaviorScriptsPatch.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/RMv21BehaviorScriptsPatch.java
index baf6f6298a..723036e632 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/RMv21BehaviorScriptsPatch.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/RMv21BehaviorScriptsPatch.java
@@ -135,7 +135,7 @@ public class RMv21BehaviorScriptsPatch extends RMv21PatchComponent implements Be
                             // Move files from RM Scripts folder to RM Behavior Scripts folder.
                             List<FileInfo> oldBehaviorScripts = fileFolderService.listFiles(OLD_BEHAVIOR_SCRIPTS_FOLDER);
 
-                            if (oldBehaviorScripts != null && oldBehaviorScripts.isEmpty() != true)
+                            if (oldBehaviorScripts != null && !oldBehaviorScripts.isEmpty())
                             {
                                 if (logger.isDebugEnabled())
                                 {