Agree on both comments. We should try to be more strict with exception and we should leave a TODO here for future reinvestigation / work.