Added catching for arguments
Merge pull request #12 from texastony/masterTony641

Added catching for arguments