Bug Fix: Proper Shell Return Values

- Apparently 'return' does set the exit code