Added recovery for nil parameters