Added fixers for a nullPointerException