Fix for potential NPE