Fixed errors when callback wasn't passed in