0.2.1 with error handling fixes