More work on API errors
More work on API errors

joelmahoney/discoverbps,joelmahoney/discoverbps,joelmahoney/discoverbps,joelmahoney/discoverbps,joelmahoney/discoverbps,joelmahoney/discoverbps,joelmahoney/discoverbps,joelmahoney/discoverbps