Simpler solution for the crashes when the wallpaper is set
Refactoring of the log messages