Fixed NPE when EditTextField had NULL value