chaged error message and behaviour for no context
Merge branch 'master' of https://github.com/ThePenguin1140/NSO-App