Be safe: prevent needlesticks

Be safe: prevent needlesticks