Error handling, no more panics.

Again here.