Beefed up error logging... kinda