added timeout argument to psl-cli and fixed some internal behaviour so
we're not getting stacktraces