1.3 Fixed error handling