Add a little extra safety check