Hopefully more robust error handles/More analytics