Handling errors better for #github