Forgot to do some error-checking