Removed assert that caused problems when inconsistent address length were used.

Removed assert that caused problems when inconsistent address length were used. Also encapsulated following code in a proper ifdef pragma.