- Where applicable mark option required so that user is notified instead of blindly using null. - Fixes #436