Error logging & handling tweaks