Added some flare and error checking