ADD: Better error handling, mainly in Statement