#46, #32 more errror handling stuff