Dont panic

Removes two panics