Better error checking, better help