Make sure there is a valid delta/beta even if it was set as None

The server can set delta/beta to None, as result the value does not fall back with the default.

This patch enforce a default value in case of an explicit None