Fixed a bug checking if String number equals "0" - changed to
number!=null