- Fixed error handling?