Making empty body check as an option