#153. Fixed issue with null value, post form refactoring completed.