* Added some error checking