Added 'temporary' Null pointer fix with logger output