Updated some logging messages to not crash.  Other logging changes.