Change some annotations to return null instead of .