Fix null reference call for disabled props