fix return null, return should not be on a line by itself