TISTUD-6877 NPE in Log when Studio is shutdown
Merge pull request #249 from sgtcoolguy/TISTUD-6877

TISTUD-6877