fix removing props from nil