-Added null check for fieldHandlers