Small changes to fency

Changed expand symbols for Fency and fixed NPE bug.