#1132: Fixed potential NPE