Code

Make error message more specific on where the error is.