Add additional check if list exists

Fix #93