[FIX, INTERNAL] Changed a wrong return type and deleted some superfluous checks.