bugfix: handle non-existent default

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
Merge remote-tracking branch 'steven/issue/239'