LOW / Fix NPE that occurs when a parameter is deletd