Added some error checking, to make sure we weren't showing weird values.