Small fix for better error info handling