Error handling for setup

Also more bucket todos for future versions