Fix a few uncatched errors