Changed error handling ...