Updates for better error reporting