...Even better error handling