Add basic error catching and usage