Pushed some code to prevent errors.