Added better exception handling.
Updated Makefile and README.