Index: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/RMContainerTokenSecretManager.java =================================================================== --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/RMContainerTokenSecretManager.java (revision 1490228) +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/RMContainerTokenSecretManager.java (working copy) @@ -191,6 +191,11 @@ this.readLock.unlock(); } - return BuilderUtils.newContainerToken(nodeId, password, tokenIdentifier); + try { + return BuilderUtils.newContainerToken(nodeId, password, tokenIdentifier); + } catch (IllegalArgumentException e) { + LOG.error("Error trying to create container token", e); + return null; + } } -} \ No newline at end of file +}