Improve guard logic

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Blob use rugged

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>