Catch IllegalArgumentException when attempting to set password to an empty string and set it back to the original password (#2)