anchor.diff:  	 * {@inheritDoc}
   	 */
   	
  -	public cfesapi.org.owasp.esapi.User function createUser(required String accountName, 
  -	                                                        required String password1,
  -	                                                        required String password2) {
  +	public cfesapi.org.owasp.esapi.User function createUser(required String accountName, required String password1, required String password2) {
   		loadUsersIfNecessary();
   		if(trim(arguments.accountName) == "") {
  -			throwError(new cfesapi.org.owasp.esapi.errors.AuthenticationAccountsException(instance.ESAPI, "Account creation failed", "Attempt to create user with blank accountName"));
  +			local.exception = new cfesapi.org.owasp.esapi.errors.AuthenticationAccountsException(instance.ESAPI, "Account creation failed", "Attempt to create user with blank accountName");
  +			throwError(local.exception);
   		}
   		if(isObject(getUserByAccountName(arguments.accountName))) {
  -			throwError(new cfesapi.org.owasp.esapi.errors.AuthenticationAccountsException(instance.ESAPI, "Account creation failed", "Duplicate user creation denied for " & arguments.accountName));
  +			local.exception = new cfesapi.org.owasp.esapi.errors.AuthenticationAccountsException(instance.ESAPI, "Account creation failed", "Duplicate user creation denied for " & arguments.accountName);
  +			throwError(local.exception);
   		}
   	
   		verifyAccountNameStrength(arguments.accountName);
   	
   		if(trim(arguments.password1) == "") {
  -			throwError(new cfesapi.org.owasp.esapi.errors.AuthenticationCredentialsException(instance.ESAPI, "Invalid account name", "Attempt to create account " & arguments.accountName & " with a blank password"));
  +			local.exception = new cfesapi.org.owasp.esapi.errors.AuthenticationCredentialsException(instance.ESAPI, "Invalid account name", "Attempt to create account " & arguments.accountName & " with a blank password");
  +			throwError(local.exception);
   		}
   	
   		local.user = new DefaultUser(instance.ESAPI, arguments.accountName);
  
positive.code: 	}
  	
  	/**
       * {@inheritDoc}
       */
       
      public function getUserByAccountId(required numeric accountId) {
          if (arguments.accountId == 0) {
              return new cfesapi.org.owasp.esapi.User$ANONYMOUS(instanceESAPI);
          }
          loadUsersIfNecessary();
          if (structKeyExists(instance.userMap, arguments.accountId)) {
  	        return instance.userMap.get(arguments.accountId);
          }
          return "";
      }
  
      /**
       * {@inheritDoc}
       */
  	 
      public function getUserByAccountName(required String accountName) {
          if (arguments.accountName == "") {
              return new cfesapi.org.owasp.esapi.User$ANONYMOUS(instanceESAPI);
          }
          loadUsersIfNecessary();
          for (local.u in instance.userMap) {
              if (instance.userMap[local.u].getAccountName().equalsIgnoreCase(arguments.accountName)) {
                  return instance.userMap[local.u];
              }
          }
          return "";
      }
      
      /**
       * {@inheritDoc}
       */
       
      public Array function getUserNames() {
          loadUsersIfNecessary();
          local.results = [];
          for (local.u in instance.userMap) {
              local.results.add(instance.userMap[local.u].getAccountName());
          }
          return local.results;
      }
  	
  	/**
  	 * {@inheritDoc}
  
negative.code: 		}
  		catch(java.io.IOException e) {
  			instance.logger.fatal(newJava("org.owasp.esapi.Logger").SECURITY_FAILURE, "Problem saving user file " & instance.userDB.getAbsolutePath(), e);
  			local.exception = new cfesapi.org.owasp.esapi.errors.AuthenticationException(instance.ESAPI, "Internal Error", "Problem saving user file " & instance.userDB.getAbsolutePath(), e);
  			throwError(local.exception);
  		}
  		finally
  		{
  