Fix for potential NPE on startup