Better error handling w/latest build