Fix bundle loaded log entries
Add some error trapping and additional logging