refactor
If nil return value, use the form buffer instead

closes #887
Merge pull request #1996 from Daxter/bugfix/887-form-buffers

[887] Respect the form buffer!