diff --git a/src/org/ice4j/ice/Candidate.java b/src/org/ice4j/ice/Candidate.java
index 530437b..95fc757 100644
--- a/src/org/ice4j/ice/Candidate.java
+++ b/src/org/ice4j/ice/Candidate.java
@@ -563,10 +563,13 @@ public abstract class Candidate
*
* @return the TransportAddress of the base if this is a reflexive
* candidate, the mapped address in the case of a relayed candidate, and
- * null if this is a host candidate.
+ * null if this is a host or a remote candidate.
*/
public TransportAddress getRelatedAddress()
{
+ if(this instanceof RemoteCandidate)
+ return null;
+
if ( getType () == CandidateType.SERVER_REFLEXIVE_CANDIDATE
|| getType () == CandidateType.PEER_REFLEXIVE_CANDIDATE)
{
diff --git a/src/org/ice4j/ice/Component.java b/src/org/ice4j/ice/Component.java
index 8bbba33..56c65e0 100644
--- a/src/org/ice4j/ice/Component.java
+++ b/src/org/ice4j/ice/Component.java
@@ -323,7 +323,7 @@ public class Component
if(remoteCandidatesCount > 0)
{
- buff.append("\n" + remoteCandidatesCount + " rocal candidates:");
+ buff.append("\n" + remoteCandidatesCount + " remote candidates:");
synchronized(remoteCandidates)
{
diff --git a/src/org/ice4j/socket/StunDatagramPacketFilter.java b/src/org/ice4j/socket/StunDatagramPacketFilter.java
index 8d62ab5..0de7eeb 100644
--- a/src/org/ice4j/socket/StunDatagramPacketFilter.java
+++ b/src/org/ice4j/socket/StunDatagramPacketFilter.java
@@ -33,7 +33,7 @@ public class StunDatagramPacketFilter
* @return true if this DatagramPacketFilter accepts the
* DatagramPacket which represents a STUN message with the
* specified STUN method; otherwise, false
- * @see BaseStunDatagramPacketFilter#acceptMethod(char)
+ * @see AbstractStunDatagramPacketFilter#acceptMethod(char)
*/
public boolean acceptMethod(char method)
{