Second Commit

Handle Errors