Handle missing func better