Error checking (13/28)

Error checking