Fix dronie NPE

and other small fixes
@squilter this `case` block, and the one above are missing a `break` statement. Is that intentional?