Added null input cases