Error checking (4/28)

Error checking