Minor clean up and add logging for file load problem