Merge "Fix NullPointerException on addErrorCode when input is Invalid error code"