Finished Catch throw

found and fixed a bug