Fix for #845

Compensating in case user enters no default values.