Avoid zero or leading zero responses

@Yimi, you could do it as outlined in the post discussed previously: