Added textfield / password field null checking.