Added some safe checks when there are no signatures