Included error handling