WIP: shell: Return-based error-handling for shell handlers

WIP
still looks odd ;)