Fixing null coverage return