Check for DSL object:

We don't check whether we actually got a DSL object, which produces
a undef error instead of saying we couldn't find one.
Merge branch 'fix/dsl'