Minor error-checking update
Minor error-checking update