Fix case when no app-specific shells created

See http://git.io/sFuEAw