Add another error check