# Improve error handling