Fixed server to never return null