move creations check into handler