Fixed typos and added usage catch