Merge "Check for null ferr"