TRUNK-3959 - TRUNK-3955 

I've fixed this bug just replacing != for .equals with the correct logic. 

In the trunk 3955 I've change to pass a new Location instead of a string "".