Bugfix. Bail when we couldn't get a value