Added some error handling… :-)