Added check for no callback passed