Started working on error handling in 1.4