Added error handling :trophy: top-tier code