Handle errors better
More error handling
Merge branch 'queue' of github.com:zbanks/musicazoo into queue