A little more gracious error handling. #138