Error checking (2/28)

Error checking