Working a bit on error catching.