Minor change for better error reporting to user