Try to handle empty POST.
Merge with master.