Add more checking