404 for non-existing instances instead of defaulting to global

This fixes #195.
Merge remote branch 'nidico/feature-195-404-instead-of-defaulting' into develop