Demo fixes

Fixes for insufficient error checking, #3524 (closed).

TODO

• fixes #3524 (closed).
• fix #3523 (closed).
• fix tests failing
• fix demo locally

@arechnitzer feel free to push fixes to this branch.