more gracefully handle non-fatal error of a file not being encoded using the system locale's encoding
cleaned up imports