Dev 1.1 Second Pull Request

this will create uncaught exception po. please put it inside try catch :bow: