Added some more checks

Signed-off-by: Levi Gross <levi@levigross.com>