Fixed some endpoints to fail gracefully

fixes #25