Roni | BSHR-100 | NullPointerException Bug fixed