fixed potential NPE with props