Added more checks

Signed-off-by: Derik Evangelista <kirederik@gmail.com>