Fixes Ok-button being able to 'crash' application due to empty fields